modified:   view/user_create_ajax.htm
	modified:   view/user_login_ajax.htm
Merge branch 'master' of github.com:xiuno/xiunobbs
	modified:   admin/control/conf_control.class.php
	modified:   control/user_control.class.php
	modified:   model/mmisc.class.php
	modified:   model/user.class.php