Merge dev into feature/340-contact-merge
merging in Jamesmelville pull request: https://github.com/SalesforceFoundation/Contacts_and_Organizations/pull/26/commits for adding list support to Contact Merge.
Merge branch 'feature/340-contact-merge' of https://github.com/SalesforceFoundation/Cumulus into feature/340-contact-merge
Merge dev into feature/340-contact-merge
Merge dev into feature/340-contact-merge
Upgrade to new original NPSP packages
Merge pull request #566 from SalesforceFoundation/feature/564-upgrade-orig-packages

Upgrade to new original NPSP packages
Merge pull request #560 from SalesforceFoundation/feature/340-contact-merge

Feature/340 contact merge
Merge dev into feature/521-addr-settings-page