Made additional buttons visible
Merge branch 'TR-ML-Development' of
https://github.com/matthewlopatka/openmrs-core.git into
TR-ML-Development

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