SalesforceFoundation/Cumulus — pull request #957 by mrbelvedere (2014-08-16 17:56:42+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