added: login/logout-switch
Merge branch 'new-feature_login-logout-switch'