SalesforceFoundation/Cumulus — pull request #598 by mrbelvedere (2014-04-04 15:38:11+00:00)
Title: Merge conflict merging dev into feature/47-hhaccount-conversion

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