some upd
Merge remote-tracking branch 'origin/master'
login, logout fix