SalesforceFoundation/Cumulus — pull request #1061 by mrbelvedere (2014-09-25 15:57:35+00:00)
Title: Merge conflict merging dev into feature/721-allocations

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