Updated template.html with standard head info
Merge remote-tracking branch 'origin/master'

Conflicts:
	template.html
Updated template.html with standard head info