jlantz/GrantLifecycleApp — pull request #4 by mrbelvedere (2014-10-08 21:57:51+00:00)
Title: Merge conflict merging master into feature/configure-cumulusci

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