Changes patientRegimen
Merge branch 'master' of
https://github.com/matthewlopatka/openmrs-core.git

Conflicts:
	webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp