注册信息功能添加
Merge branch 'master' of github.com:334777583/tcht

Conflicts:
	logic/controls/userlogin.class.php