Update gradle to 1.10 to enable reporting on cucumber tests in
functional-tests
Update gradle to 1.10 to enable reporting on cucumber tests in
functional-tests
Add functional-tests:test to default tasks
Change json-pretty to json
Correct import path
Correct import path
Merge pull request #57 from cathy-mcdonald/master

Get links from Admin page working in new modules
Correct classpath in imports
Correct classpath in imports
Correct path in imports
Changing conceptpropose -> conceptreview error in Spring config
Specifying ids for dozer mappers to avoid conflict
Removing release jars from conceptreview to avoid conflicts
Comment out undefined steps in tests
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Correct code in GetLastProposalName to get last not second to last
Merge pull request #1 from cathy-mcdonald/master

Pull changes from master