Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Fix find password
Fix edit user
Merge pull request #654 from liuchuangww/user

User