Temporary navbar reconstruction to look ok in 1024x768
Merge remote-tracking branch 'data/master' into development

Conflicts:
	app/views/shared/_navbar.html.erb