SalesforceFoundation/Cumulus — pull request #824 by mrbelvedere (2014-06-26 15:46:30+00:00)
Title: Merge conflict merging dev into feature/template-layouts

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