SalesforceFoundation/Cumulus — pull request #1083 by mrbelvedere (2014-10-01 20:41:54+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