#642 Fixed json bug where any module with a table quesiton could not be edited in the module editor (this has to do with changes made in ticket #516
#642 fixed errors not allowing chrome to save or delete templates
#642 added work around for firefox bug in ui-tree which allowed the dropping of text between two elses in some cases
#642 removed example template from DB scripts as well as a test that tested viasta question and answer templates
#642 removed failing test due to removed test template
t642: return error if no son file in the database.
t642: add battery template support.
Merge remote-tracking branch 'origin/t642' into t660

Conflicts:
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/services/TemplateService.js
	eScreeningDashboard/src/main/webapp/resources/editors/states.js
	eScreeningDashboard/src/main/webapp/resources/editors/views/templates/templateeditor.html
Merge branch 't660' of github.com:VHAINNOVATIONS/Mental-Health-eScreening into t660