scss lint
Merge remote-tracking branch 'origin/master' into scssLint

Conflicts:
	app/styles/layout/backlog.scss