SalesforceFoundation/Cumulus — pull request #959 by mrbelvedere (2014-08-16 17:56:46+00:00)
Title: Merge conflict merging dev into feature/941-google-geo

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