Merge dev into feature/521-addr-settings-2
Improving the address settings ui and instructions.
Removing references to deleted labels from package.xml.
Improved error messages for address verification settings testing.
Merge dev into feature/521-addr-settings-2
Merge pull request #601 from SalesforceFoundation/feature/521-addr-settings-2

Feature/521 addr settings 2
Merge pull request #603 from SalesforceFoundation/feature/sprint13-misc-fixes

multiple fixes for sprint 13
Merge dev into feature/sprint13-misc-fixes