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

Conflicts:
	[CODE]/three.js/template/templateMain