SalesforceFoundation/Cumulus — pull request #831 by mrbelvedere (2014-06-30 20:25:53+00:00)
Title: Merge conflict merging dev into feature/821-addr-verif-https

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