Fix edit user account and add custom activity
Merge pull request #556 from liuchuangww/user

Fix edit user account and add custom activity
Recovery delete file
Merge pull request #557 from liuchuangww/user

Recovery delete file
Merge branch 'user' into sso