Navbar includes username
Merge branch 'master' into gsurvey