修改注册流程
Merge branch 'master' into launch