logout button in new nav
Merge branch 'feature/notifications' into development