#660 Added block template modal
Merge commit '2d3eafe7b15f86dea4aeb550c5842f4a5e8d2719' into t660

Conflicts:
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/templates/templateListController.js
Moved modal from legacy templateListController to ModuleTemplateListController
#660 Started block template modal form
#660 Committing modal changes prior to merging in 642 and moving modal and button to correct page
Merge branch 't642' into t660

Conflicts:
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/ModuleTemplateListController.js
#660 Moved add block modal to correct view and controller
#660 Added assessmentVariables directive
Merge branch 't642' into t660
#660 Added proposed template JSON and updated modal to reflect it
Merge branch 't642' into t660
Merge branch 'master' into t660

Conflicts:
	eScreeningDashboard/src/main/java/gov/va/escreening/repository/MeasureRepositoryImpl.java
	eScreeningDashboard/src/main/sql/sprint_23/26_sprint23_reference_data_templates.sql
	eScreeningDashboard/src/test/java/gov/va/escreening/assessments/test/RepositoryTest.java
#660 Updated edit block modal after merge
#660 Updated updateBlock and modal to account for properties on block
#660 Template block modal now displays blocks recursively
#660 Added templateBlockEditorDirective
#660 Added initial logic for block type selections
#660 Updated If Condition switch statement
#660 Upgraded angular-animate to 1.2.15 and textAngular to 1.2.2
#660 Testing textAngular provider decorator for custom wysiwyg button controls