AM-6 merge problems fixed
Merge branch 'master' of https://github.com/openmrs/openmrs-module-appointment