Require Households 3.1
Merge pull request #1064 from SalesforceFoundation/feature/1063-require-households-3.1

Require Households 3.1
Merge dev into feature/1046-user-custom-setting-bug