core-5239 update template name for clarity
core-5239 conversion file for template name update
core-5239 fix name sapce in conversion file for template name update
removed a swap file
Merge branch 'master' into dev

Conflicts:
	src/main/data/99_version.sql