grunt-less
Merge branch 'design' into camera

Conflicts:
	package.json