SalesforceFoundation/Cumulus — pull request #506 by mrbelvedere (2014-03-13 16:21:19+00:00)
Title: Merge conflict merging dev into feature/412-address-verification

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