Merge dev into feature/1105-primary-contact-first-in-hh-naming
Merge dev into feature/1105-primary-contact-first-in-hh-naming
Merge dev into feature/1105-primary-contact-first-in-hh-naming
Merge dev into feature/1105-primary-contact-first-in-hh-naming
Merge dev into feature/1105-primary-contact-first-in-hh-naming
fix bug introduced with primary contact effecting hh naming.  make sure to only look for primary contact on household accounts, not household objects.
update metadata reference to 3.1 of np02
Merge pull request #1156 from SalesforceFoundation/feature/1105-primary-contact-first-in-hh-naming

Feature/1105 primary contact first in hh naming
Merge dev into feature/1046-user-custom-setting-bug