SalesforceFoundation/Cumulus — pull request #1028 by mrbelvedere (2014-09-10 12:43:09+00:00)
Title: Merge conflict merging dev into feature/929-Household-and-opps

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