Merge pull request #413 from SalesforceFoundation/dev

Merge pull request #397 from SalesforceFoundation/feature/208-settings-u...
update all settings panels to use custom labels for help text and embedded strings
updated help text
Merge pull request #423 from SalesforceFoundation/feature/208-settings-ui

finish converting all Settings panels to use custom labels
Merge dev into feature/184-rollup-test-refactor