update template ctrl
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/controllers/template.js