aaa
Merge branch 'master' of https://github.com/xiaohuajiao123/izhiqi

Conflicts:
	izhiqi/Lib/Action/Admin/UserAction.class.php
	izhiqi/Tpl/Admin/User/info.html
bbb
Merge branch 'master' of https://github.com/xiaohuajiao123/izhiqi