Grunt Compass 1.0.1

Grunt Browser Sync 1.3.7
Merge branch 'develop' into feature/minify

Conflicts:
	package.json