better navmenuscaling
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/navmenu.scala.html
	public/stylesheets/main.css
better navmenuscaling