SalesforceFoundation/Cumulus — pull request #1145 by mrbelvedere (2014-10-30 19:29:40+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