in progress
Merge branch 'vis-impr' into develop

* vis-impr:
  in progress

Conflicts:
	app/views/layouts/web/shared/_navbar.html.haml