fix logout
Merge branch 'develop'