updated templates
Merge branch 'master' of github.com:razorflow/docs

Conflicts:
	Gruntfile.js