修正用户注册bug
Merge branch 'master' of https://github.com/admarket/code

Conflicts:
	controller/main.php