Merge pull request #5 from TechZi/master

绑定邮箱流程完成
Merge pull request #9 from huahuajiujiu/master

fix the auto merge bugs