changed naming convention on templates
Merge remote-tracking branch 'origin/master' into requirejs

Conflicts:
	Gruntfile.coffee