Fixed bugs -- updated!
Merge remote-tracking branch 'origin/master'

Conflicts:
	radiotest/omod/src/main/java/org/openmrs/module/radiotest/web/controller/RadioHomeController.java
	radiotest/omod/src/main/java/org/openmrs/module/radiotest/web/controller/RadioPatientFormController.java
	radiotest/omod/src/main/webapp/results.jsp
	radiotest/omod/src/main/webapp/searchPatientForm.jsp
	radiotest/omod/src/main/webapp/transactionForm.jsp