验证
邮件发送
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/controllers/validate.php