Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Uclient user list page
Merge pull request #473 from liuchuangww/user

Fix edit account error status
Merge pull request #472 from sexnothing/user

User module and uclient
Fix for uclient role assignment
Fix reset email