Change gradle build to target Java 1.6 for the as Java 7/1.7 omods incompatible with CI
Merge pull request #59 from thewheat/master

Change gradle build to target Java 1.6  (Java 7 omods incompatible with CI)
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
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 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
Functional Test Work (with some caveats)
fix the url (from conceptpropose to conceptreview) when submitting proposal (its pointing to the old 1 before the split of module)
Fix the submit proposal which seems to be broken ( when click on send proposal it will show as submitted, but its not saved on the reviewer side nor in the db).

- not mapped the id field on dozer from propose dto to review entity. The id could be different on both, they are distinguished via uuid.
 -manually set the status to RECEIVED on dictionary manager as dozer has nullify the field when mapping from DTO to review entity class. -> hence causing hibernate error when persisting.
Merge pull request #64 from waichee/feature/fix-broken-proposal

Feature/fix broken proposal take 2 after reversing commit
Merge pull request #62 from thewheat/master

Functional tests work (with some caveats)