Fixes for OpenEMPI update
Merge branch 'openempifix' of https://github.com/surangak/rhea-shr-adapter into merge-openempi-fixes

Conflicts:
	omod/src/main/java/org/openmrs/module/rheashradapter/web/controller/RHEApatientController.java
Merge pull request #47 from jembi/merge-openempi-fixes

Merge openempi fixes