closes #17 Verified other Tickets as well
Merge branch 'master' of https://github.com/Nnabugw/openmrs-core