Merge pull request #1059 from SalesforceFoundation/feature/1058-account-model-setting-overwrite

Fixing #1058 and UTIL_CustomSettingsFacade.cls whitespace issues.
Require Households 3.1
Merge pull request #1064 from SalesforceFoundation/feature/1063-require-households-3.1

Require Households 3.1
Merge dev into feature/1058-account-model-setting-overwrite