logout and login
Merge branch 'feature/logout' into develop

* feature/logout:
  logout and login