SalesforceFoundation/Cumulus — pull request #408 by mrbelvedere (2014-02-14 21:58:09+00:00)
Title: Merge conflict merging dev into feature/208-settings-ui

mrbelvedere tried to merge new commits to dev but hit a merge conflict. Please resolve manually