Merge branch 'user' into user-adivspan
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