Merge branch 'user' into user-adivspan
Adjusted the UE
Fix reset email template error
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
Fix profile dressup field limit
Merge pull request #479 from liuchuangww/user

Fix email reset, profile dressup, field edit
Added support for form element view helper class
Added user custom form element
Added user custom form element
Added user custom form element
Merge pull request #480 from sexnothing/user

User search profile page done
CS fixes
Remove mermber role at user list page