Merge pull request #6 from huahuajiujiu/master

Merge pull request #4 from TechZi/master
完成绑定邮箱功能
Merge branch 'master' of https://github.com/TechZi/i365day
删除无用文件夹
删除无用文件夹
Merge branch 'master' of https://github.com/huahuajiujiu/i365day

Conflicts:
	application/controllers/Lib.php
	application/views/diary/create.phtml
Merge pull request #5 from TechZi/master

绑定邮箱流程完成