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 branches 'dozer' and 'settings-page' into settings-page