Fixing UTIL_CustomSettingsFacade.cls whitespace issues and resolving #1058
Merge pull request #1059 from SalesforceFoundation/feature/1058-account-model-setting-overwrite

Fixing #1058 and UTIL_CustomSettingsFacade.cls whitespace issues.
Merge dev into feature/362-trial-walkthrough