login/logout stuff
login/logout stuff
Merge origin/master