REPORTS-200: More tests, added column to report template
Merge branch 'master' of github.com:AMPATH/openmrs-module-amrsreports into ojwanganto-REPORTS-220B

Conflicts:
	api/src/main/resources/templates/MOH361BReportTemplate_0_1.xls