Merge dev into feature/420-kill-globals
Merge dev into feature/420-kill-globals
fixed #445, where duplicate contact roles were created for Household Accounts.
fixed #445, where duplicate contact roles were created for Household Accounts.
Merge pull request #451 from SalesforceFoundation/feature/420-kill-globals

fix for #445, where duplicate contact roles were created for Household Accounts
Merge dev into feature/208-settings-ui