Merge remote-tracking branch 'upstream/user' into user
Merge pull request #628 from liuchuangww/user

Fix custom email template
Merge remote-tracking branch 'upstream/user' into user
Code cleaning up
User module bug fixed
Merge branch 'user' of https://github.com/pi-engine/pi into user
Merge pull request #630 from sexnothing/user

User module bug fixed
Fix validator