SalesforceFoundation/Cumulus — pull request #810 by mrbelvedere (2014-06-24 19:15:09+00:00)
Title: Merge conflict merging dev into feature/362-trial-walkthrough

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