SalesforceFoundation/Cumulus — pull request #811 by mrbelvedere (2014-06-24 19:15:10+00:00)
Title: Merge conflict merging dev into feature/554-custom-hh-naming

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