Added Chikungunya tests and modified tests as requested by Dimitri
Merge pull request #293 from jfurlong/oe4.1.1

Added Chikungunya tests and modified tests as requested by Dimitri
Added collection date/time to haiti patient report

https://www.pivotaltracker.com/story/show/74984768
Merge pull request #294 from pfschwartz/oe4.1.1

Added collection date/time to haiti patient report
Removed "Test" from column header when the activity or rejection report is selected by test

https://www.pivotaltracker.com/story/show/74742984
Merge pull request #295 from pfschwartz/oe4.1.1

Removed "Test" from column header when the activity or rejection report ...
Minor localization fixes to the Rejection Report
Merge branch 'oe4.1.1' of https://github.com/openelisglobal/openelisglobal-core into oe4.1.1

Conflicts:
	app/WebContent/WEB-INF/reports/RejectionReport.jasper
Merge pull request #296 from jfurlong/oe4.1.1

Fixed some localization changes in the Rejection reports.
Update to audit report

https://www.pivotaltracker.com/story/show/55594884
Merge pull request #297 from pfschwartz/oe4.1.1

Update to audit report
Added UOM for viral load activity report, removed uom from viral load select list options

https://www.pivotaltracker.com/story/show/74742984
Merge pull request #298 from pfschwartz/oe4.1.1

Added UOM for viral load activity report, removed uom from viral load se...
Updates to Culture des Selles (Positive -> Antibiogramme)
Added new fields to EPI report and csv file
Merge pull request #299 from jfurlong/oe4.1.1

Updates to Culture des Selles (Positive -> Antibiogramme)
Corrected text for admin->config sample entry->program->edit

https://www.pivotaltracker.com/story/show/77058066
Merge branch 'oe4.1.1' into develop

* oe4.1.1:
  Corrected text for admin->config sample entry->program->edit
  Added new fields to EPI report and csv file
  Updates to Culture des Selles (Positive -> Antibiogramme)
  Added UOM for viral load activity report, removed uom from viral load select list options
  Update to audit report
  Minor localization fixes to the Rejection Report
  Removed "Test" from column header when the activity or rejection report is selected by test
  Added collection date/time to haiti patient report
  Added Chikungunya tests and modified tests as requested by Dimitri

Conflicts:
	app/WebContent/WEB-INF/reports/RejectionReport.jasper
	app/WebContent/WEB-INF/reports/RejectionReport.jrxml
	app/src/MessageResources.properties
	app/src/MessageResources_fr.properties
	app/src/us/mn/state/health/lims/common/services/historyservices/NoteHistoryService.java
	app/src/us/mn/state/health/lims/reports/action/implementation/HaitiLNSPExportReport.java
	app/src/us/mn/state/health/lims/reports/action/implementation/PatientHaitiClinical.java
	app/src/us/mn/state/health/lims/reports/action/implementation/RejectionReport.java
	app/src/us/mn/state/health/lims/reports/action/implementation/RejectionReportByTest.java
Localization fixes for menu

https://www.pivotaltracker.com/story/show/67406180
Merge pull request #303 from pfschwartz/develop

Merged from 4.1.1