fix #617. Household Naming is wrong when you view the household account in the ManageHouseholdUI
fix #616.  Contact with Address Override doesn't show it has an override in the ManageHouseholdUI page.
Merge branch 'feature/sprint13-misc-fixes' of https://github.com/SalesforceFoundation/Cumulus into feature/sprint13-misc-fixes
Merge pull request #619 from SalesforceFoundation/feature/sprint13-misc-fixes

2 fixes in ManagehouseholdUI
Merge dev into feature/340-contact-merge