Merge branch 'user' into user-adivspan
Adjusted the UE
Merge pull request #477 from linzongshu/user

Adjusted the UE
Fixed the user module template about account basic setting
Merge branch 'user' into user-adivspan
Merge pull request #478 from adivspan/user-adivspan

User adivspan
Merge remote-tracking branch 'upstream/user' into user