text->password
修改email文本
更改menu的顺序
ready merge master
Merge branch 'email-register-test'