Merge branch 'testz' into dev

Conflicts:
	Gruntfile.js
	index.html
Merge branch 'dev'