修改邮件发送失败的提示文字
解决冲突
Merge branch 'master' of https://github.com/xshanj2/sitehtml

Conflicts:
	ajax.sendmail.php