Merge remote-tracking branch 'upstream/dev' into dev
add logout
Merge pull request #48 from czx0619/dev

Dev