Merge pull request #9 from TechZi/master

向yp分支推入代码
Merge pull request #12 from huahuajiujiu/master

fix the bug of first login