conditional display in navbar for login
profile link in nav
Merge branch 'master' into navbar-edit

hi ho merge
Merge branch 'master' into navbar-edit
merging in email branch
Merge pull request #49 from avifoxi/navbar-edit

Navbar edit