SalesforceFoundation/Cumulus — pull request #914 by mrbelvedere (2014-08-05 00:16:44+00:00)
Title: Merge conflict merging dev into feature/499-hh-account-lookup-filters

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