nav-header
Merge remote-tracking branch 'origin/elena' into elena

Conflicts:
	app/views/layouts/application.haml
Merge remote-tracking branch 'origin/elena' into elena

Conflicts:
	app/stylesheets/application.sass
	app/stylesheets/partials/_960grid.sass