Incl. logout link, and some user love in the navbar.
Merge branch 'develop'