提交会员汇总
Merge branch 'master' of https://github.com/hcsoft/xingkang

Conflicts:
	admin/control/member.php