Merge branch 't585' into po_ready
Merge branch 't617' into po_ready
Merge remote-tracking branch 'origin/t642' into po_ready

Conflicts:
	eScreeningDashboard/pom.xml
	eScreeningDashboard/src/main/java/gov/va/escreening/context/VeteranAssessmentSmrList.java
	eScreeningDashboard/src/main/sql/sprint_25/27_sprint25_reference_data_template_variables.sql
	eScreeningDashboard/src/main/webapp/resources/editors/views/batteries/batteryselect.html
	eScreeningDashboard/src/main/webapp/resources/editors/views/modules/modulesselectview.html
	eScreeningDashboard/src/test/java/gov/va/escreening/assessments/test/RepositoryTest.java
Merge branch 'po_ready' of github.com:VHAINNOVATIONS/Mental-Health-eScreening into po_ready
Merge remote-tracking branch 'origin/t660' into po_ready

Conflicts:
	eScreeningDashboard/pom.xml
	eScreeningDashboard/src/main/java/gov/va/escreening/service/AssessmentVariableService.java
	eScreeningDashboard/src/main/java/gov/va/escreening/service/AssessmentVariableSrviceImpl.java
	eScreeningDashboard/src/main/java/gov/va/escreening/variableresolver/MeasureAssessmentVariableResolverImpl.java
	eScreeningDashboard/src/main/sql/sprint_25/27_sprint25_reference_data_template_variables.sql
	eScreeningDashboard/src/main/sql/sprint_25/28_springt25_template.sql
	eScreeningDashboard/src/main/sql/sprint_25/28_sprint25_template.sql
	eScreeningDashboard/src/main/sql/ticketRelatedChanges/28_springtXX_template.sql
	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/test/java/gov/va/escreening/assessments/test/AssessmentVariableTest.java
Merge branch 't660' into po_ready
merge t726
merge t726
Merge branch 't724' into po_ready
merge in t724
Merge branch 't729' into po_ready
Merge branch 't720' into po_ready
Merge branch po_ready of https://github.com/VHAINNOVATIONS/Mental-Health-eScreening into t723
t723-- sql script for the questions and answers templates
add template_survey sql
Merge branch 'po_ready' of https://github.com/VHAINNOVATIONS/Mental-Health-eScreening into t723
merge t717
Merge branch 'po_ready' of https://github.com/VHAINNOVATIONS/Mental-Health-eScreening into t723
Merge branch 't660' into po_ready
Merge branch 't660' into po_ready