template editor
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/assets/angularTemplates/overview.html
	src/assets/angularTemplates/templateEditor.html
	src/assets/js/app.js
	src/assets/js/controllers.js
document type editor