SalesforceFoundation/Cumulus — pull request #540 by mrbelvedere (2014-03-20 20:06:13+00:00)
Title: Merge conflict merging dev into feature/409-address-mgmt

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