fix logout bug
Merge branch 'master' into tony