more fixes...
Merge branch 'master' of https://github.com/muymoo/openmrs-core