-New release
Merge branch 'develop' of https://github.com/hal313/template-manager into develop

Conflicts:
	dist/TemplateManager.js
	dist/TemplateManager.min.js
	dist/TemplateManager.min.js.map