Continued: report generation
Merge remote-tracking branch 'origin/master'

Conflicts:
	radiotest/omod/src/main/java/org/openmrs/module/radiotest/web/controller/RadioTransactionController.java