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.
Require Households 3.1
Merge pull request #1064 from SalesforceFoundation/feature/1063-require-households-3.1

Require Households 3.1
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into feature/983-data-importer

Conflicts:
	src/classes/UTIL_CustomSettingsFacade.cls