login and out working
Merge commit '2a2c1f5562942d7ec27fc6b08f14f31a2f7ec9a0'