Merge remote-tracking branch 'origin/develop' into feature/quick-search-laziness

Conflicts:
	src/ggrc/assets/stylesheets/_lhs.scss
	src/ggrc/templates/layouts/dashboard.haml