修改密码、支付密码修改
资讯详细页
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/views/home/mailsubs.php