t660: add date modified.
t541: template name is the battery/survey + templateType name
Merge branch 't728' into po_ready
Merge branch 't723' into po_ready
#733 added unique constraint to variable_template table. Fixed backend code to not produce duplicat keys in variable_template
#733 added sprint 28 to our pom file and the missing apply-ticket-related-data entry. Added the code to clean DB since the code was still misbehaving and we will need to clean out duplicates.
Merge commit 'origin/resolved~9' into po_ready

Conflicts:
	eScreeningDashboard/pom.xml
	eScreeningDashboard/src/main/sql/sprint_25/27_sprint25_reference_data_template_variables.sql
	eScreeningDashboard/src/main/webapp/WEB-INF/views/dashboard/assessmentSummary.jsp
	eScreeningDashboard/src/main/webapp/resources/css/partialpage/standardtopofpage-dashboard_new.css
	eScreeningDashboard/src/main/webapp/resources/editors/css/escreening/standardtopofpage-dashboard_new.css
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/moduleController.js
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/modulesEditController.js
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/filters/messageFilters.js
	eScreeningDashboard/src/main/webapp/resources/editors/views/batteries/batteryselect.html
	eScreeningDashboard/src/main/webapp/resources/editors/views/modules/modulesselectview.html
Merge branch 't733' into po_ready

Conflicts:
	eScreeningDashboard/pom.xml
Merge branch 'po_ready' into t541
#541 Fixed bugs in the routing after the saving or cancelling of a Battery in the Battery editor. Added a back button to the Batteries list page so it conforms to the standard. Added the Manage Templates button to the Battery Editor
Merge branch 'resolved' into po_ready

Conflicts:
	eScreeningDashboard/pom.xml
	eScreeningDashboard/src/main/sql/sprint_25/27_sprint25_reference_data_template_variables.sql
	eScreeningDashboard/src/main/webapp/WEB-INF/views/dashboard/assessmentSummary.jsp
	eScreeningDashboard/src/main/webapp/resources/css/partialpage/standardtopofpage-dashboard_new.css
	eScreeningDashboard/src/main/webapp/resources/editors/css/escreening/standardtopofpage-dashboard_new.css
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/modulesEditController.js
Merge branch 't714' into po_ready

Conflicts:
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/moduleController.js
#541 added the template type list page for all template types which relate to Batteries.  Was able to make a new more general template list controller class to work for both battery and module related template types.
merge ooo_pilot
fix merge issue
#541 Added template editing to each Battery including the list of template types for each battery.
#541 Implemented new template processing methods for battery templates.  Updated survey template method and associated server side controllers. Wired up the welcome and completion messages for assessments to come from the rendering of the corresponding template types (this was a rework from #585 which did not use templates). Updated error logic which was not using established team conventions. Updated assessment engine ajax calls which pull welcome and completion messages.
#541 Removed battery fields used to hold welcome and completion message. Updated sql scripts to populate the OOO battery's welcome and completion template types with the correct content. Updated css to wrap text.
Merge remote-tracking branch 'origin/po_ready' into t541

Conflicts:
	eScreeningDashboard/pom.xml
Merge branch 't541' into resolved

Conflicts:
	eScreeningDashboard/src/main/webapp/WEB-INF/views/assessment/standardTemplate.jsp
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/modulesEditController.js