Merge branch 'master' into develop

Author: ThomasKranitsas

config/default.json

@@ -87,4 +87,4 @@
   },
   "STRIPE_SECRET_KEY": "",
   "sfdcBillingAccountNameField": "Billing_Account_Name__c"
-}
+}