Merge branch 'user' into user-adivspan
Merge branch 'user' into user-adivspan
Fixed user custom template
Merge pull request #571 from adivspan/user-adivspan

Fixed user custom template
Complete resend activate mail and confirm mail
Merge pull request #572 from liuchuangww/user

Complete resend activate mail and confirm mail
Merge branch 'user' into sso
Merge branch 'sso' of https://github.com/pi-engine/pi into sso