Removed .orig files hanging around from a previous merge.
Merge branch 'develop' of https://github.com/OpenHMIS/openmrs-module-openhmis.cashier into feature/cash-150