邮箱订阅修改
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/views/home/mailsubs.php
删除sql