Merge pull request #614 from liuchuangww/user

Fix custom
Merge pull request #615 from liuchuangww/user

Fix custom template
Merge pull request #616 from liuchuangww/user

Add local for message
Merge remote-tracking branch 'upstream/user' into user
Fix delete user