Fix reset email template error
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