improves lowest resolution logo placement
Merge branch 'master' into staging
adds whenever
Merge branch 'staging'

Conflicts:
	app/assets/stylesheets/application/loader.css.scss
	app/views/page/application/_navbar.html.haml