Merge dev into feature/208-settings-ui
our new Settings home page (mockup) using Bootstrap
Merge branch 'feature/208-settings-ui' of https://github.com/SalesforceFoundation/Cumulus into feature/208-settings-ui
Merge pull request #365 from SalesforceFoundation/feature/208-settings-ui

Feature/208 settings ui
Merge dev into feature/184-rollup-test-refactor