Navbar changes
Merge branch 'christian' into smidt

Conflicts:
	out/assets/stylesheets/main.css
merged hg into smidt