增加会员列表
Merge branch 'master' of github.com:guzeng/one

Conflicts:
	app/views/admin/sidebar.php