SalesforceFoundation/Cumulus — pull request #789 by mrbelvedere (2014-06-19 21:39:51+00:00)
Title: Merge conflict merging dev into feature/660-mobile-research

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