#516 fixed bug which would not allow a module with a table question to be opened for editing
#642 missing ticket related changes sql directory was causing tests to fail
#723 changed 1-2 drinks calculation value to -0 to differentiate it from the none option which has a calculation value of 0
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
t660: add unique constraints to variable template
#660 added Kai's remove duplicate variable_template entry script
t660 Fixed issue where None answers were not given to the template functions
#660 Fixed bug which would remove last <br> even if the user entered it. Now when the text block is saved extra new lines will be retained if the user added them, and editor inserted extras are removed. Updated our formatting so the text block editor doesn't look like its formatting is double spaced. Updated the text-angular definition to not use the buggy ta-default-wrap attribute; this means that using Chrome to edit text blocks should work much better. Updated tag processing to accept the <p> wrapping since no ta-default-wrap means all lines are wrapped in <p>; the editor is not consistant in this and a <br> can be found before the end of the <p> so tag processing takes this into account.
Merge branch 't660' into resolved
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