.less Grunt problem solved
Merge branch 'master' into gh-pages

Conflicts:
	Gruntfile.js