Merge branch 'gh-pages'

Conflicts:
	Gruntfile.js
	package.json