Merge dev into feature/208-settings-ui
updated metadata files to new versions of all packages
remove duplicate css class
settings pages updates for using appropriate labels in packages
Merge branch 'feature/208-settings-ui' of https://github.com/SalesforceFoundation/Cumulus into feature/208-settings-ui

Conflicts:
	src/classes/ERR_Handler.cls-meta.xml
Merge dev into feature/208-settings-ui
Merge dev into feature/208-settings-ui
converting settings to use custom labels
Change from npo02 2.97 to 2.98
new custom labels for Settings
Merge branch 'feature/208-settings-ui' of https://github.com/SalesforceFoundation/Cumulus into feature/208-settings-ui
Merge branch 'dev' into feature/208-settings-ui

Conflicts:
	scripts/cumulus.cfg
	version.properties
Merge pull request #397 from SalesforceFoundation/feature/208-settings-ui

updated all packages for improved Settings labels and help text
- Manually resolved the merge conflicts here - @davidhabib may want to check this out and make sure it looks right to you
Merge dev into feature/update-packagexml