Add terms of service for register
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #553 from liuchuangww/user

User
Merge branch 'user' into sso