Fix user log list
Merge remote-tracking branch 'upstream/user' into user
Fix delete user
Merge pull request #617 from liuchuangww/user

User