whitespace differences I could not seem to match in my org
Merge dev into feature/554-custom-hh-naming
Merge dev into feature/554-custom-hh-naming
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
Merge dev into feature/554-custom-hh-naming
Merge dev into feature/554-custom-hh-naming
Household Naming changes based off Shannon’s UX feedback.
needed to update one test to confirm to correct naming rules.
HH Custom Naming localization support, Name Overrun support, UI for Other format control, and Test Cases.
Merge branch 'feature/554-custom-hh-naming' of https://github.com/SalesforceFoundation/Cumulus into feature/554-custom-hh-naming
Merge dev into feature/554-custom-hh-naming
Merge dev into feature/554-custom-hh-naming
Merge dev into feature/554-custom-hh-naming
Merge dev into feature/554-custom-hh-naming
support any field from Contact in HH naming formats
Merge branch 'feature/554-custom-hh-naming' of https://github.com/SalesforceFoundation/Cumulus into feature/554-custom-hh-naming
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into feature/554-custom-hh-naming

Conflicts:
	src/pages/STG_PanelHouseholds.page
custom labels for screen reader labels in household settings