refactor logout
Merge branch 'BR1-1'