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

Conflicts:
	package.json