Merge pull request #3 from OpenMRS-Australia/master

Pull changes from OpenMRS-Australia:master
Give distinct names to dozer-mappings files to prevent
interaction when both modules are loaded
Give distinct names to dozer-mappings files to prevent
interaction when both modules are loaded
Give distinct names to dozer-mappings files to prevent
interactions when both modules are loaded
Merge remote-tracking branch 'cathy/dozer'
Allow edit proposal to work when both module are loaded
Merge pull request #60 from cathy-mcdonald/dozer

Fix to get Edit Proposal page to load data when both modules are loaded
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Give distinct names to dozer-mappings files
Functional tests working