Proper highlight of the navbar items.
Merge branch 'master' of github.com:rajish/muse

Conflicts:
	ui/app/scripts/app.coffee
	ui/app/scripts/directives/navbar.coffee