Moving messages from controller to labels.
Merge dev into feature/828-smartystreets-settings-labels
Merge dev into feature/828-smartystreets-settings-labels
Merge dev into feature/828-smartystreets-settings-labels
Merge dev into feature/828-smartystreets-settings-labels
Merge dev into feature/828-smartystreets-settings-labels
Merge pull request #862 from SalesforceFoundation/feature/828-smartystreets-settings-labels

Moving messages from controller to labels.
Merge dev into feature/768-manage-hh-ui-fix