SalesforceFoundation/Cumulus — pull request #901 by mrbelvedere (2014-07-31 18:04:13+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