Grunt Compass 1.0.0
Merge branch 'develop' into feature/minify

Conflicts:
	package.json