SalesforceFoundation/Cumulus — pull request #958 by mrbelvedere (2014-08-16 17:56:44+00:00)
Title: Merge conflict merging dev into feature/883-hierarchical-custom-settings-2

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