Merge branch 'bahmni' of github.com:openmrs/openmrs-module-emrapi into bahmni

Conflicts:
	api/src/main/resources/moduleApplicationContext.xml