Get most tests working. Order tests so add is first test to ensure data exists
Merge remote-tracking branch 'cathy/dozer'
Allow edit proposal to work when both module are loaded
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Give distinct names to dozer-mappings files
Functional tests working
Functional Test Work (with some caveats)
Merge pull request #62 from thewheat/master

Functional tests work (with some caveats)