t660 Update wireframe with delete button - add general comments
Wireframe updates
Clean wireframe with new navigation and delete unwanted sections
t660 update the add - or buttons
t541 access template editor from battery editor
Merge branch 't726' into resolved

Conflicts:
	eScreeningDashboard/pom.xml
#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 't723' into resolved
Merge branch 't660' into resolved
t651 wireframe add new section
#resolved patching to stop the blanking out of condition's child text blocks
Merge remote-tracking branch 'origin/t660' into resolved

Conflicts:
	eScreeningDashboard/src/main/java/gov/va/escreening/variableresolver/MeasureAssessmentVariableResolverImpl.java
Merge branch 't660' into resolved
Merge branch 't729' into resolved
Merge branch 't660' into resolved
Merge branch 'resolved' of https://github.com/VHAINNOVATIONS/Mental-Health-eScreening into resolved
t651 create section
t284 batch create batteries wireframes
t284 batch create batteries wireframes
t284 batch create batteries wireframes