注册页bug修复
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	website/application/controllers/register.php