whitespace differences I could not seem to match in my org
first pass at Custom Household Naming support.
Merge branch 'feature/554-custom-hh-naming' of https://github.com/SalesforceFoundation/Cumulus into feature/554-custom-hh-naming

Conflicts:
	src/classes/UTIL_CustomSettingsFacade.cls
whitespace differences