Merge dev into feature/983-data-importer
Merge dev into feature/983-data-importer
 #1096. NPSP Data Importer fails to create or match contacts if Email not provided and Configuration settings say to match by Email.
Revert " #1096. NPSP Data Importer fails to create or match contacts if Email not provided and Configuration settings say to match by Email."

This reverts commit 07604a62b70a5f437f6214446532adb0caabd9dd.
#1095. NPSP Data Import fails to import contact records if lastname is not provided on Contact1 or Contact2.
#1096. NPSP Data Importer fails to create or match contacts if Email not provided and Configuration settings say to match by Email.
more support and tests for validating contact fields
Merge dev into feature/983-data-importer
#1094. Workaround for NPSP Data Importer fails to process if Data Import custom settings are saved for the first time.
convert all hardcoded strings to custom labels to support localization
Merge branch 'feature/983-data-importer' of https://github.com/SalesforceFoundation/Cumulus into feature/983-data-importer
 #1099. NPSP Data Importer can handle unexpected exceptions and just mark the specific data import record with the failure, and then retry all of the other import records.
#1100.  Add npsp__ prefix to all field names, and add a row with field labels for use with the Salesforce Data Import Wizard
Merge dev into feature/983-data-importer
refer to custom labels we've already packaged, that we no longer referred to, to keep then in our local packages.
Merge pull request #1115 from SalesforceFoundation/feature/983-data-importer

Feature/983 data importer
Merge dev into feature/1046-user-custom-setting-bug