Changed getTemplateName for template
Merge remote-tracking branch 'jc/master'

Conflicts:
	rpicam.coffee