Merge pull request #1 from hisway/master

inti
inti
hh
hh
web
Merge remote-tracking branch 'origin/master' into dev-z
Merge remote-tracking branch 'origin/master' into dev-x

Conflicts:
	README.md
	shop/Conf/config.php
	shop/Modules/Admin/Conf/config.php
	shop/Modules/Index/Conf/config.php
	shop/Modules/Member/Conf/config.php
Merge remote-tracking branch 'origin/master' into dev-x
Merge remote-tracking branch 'origin/master' into dev-z
index
权限管理完成
xx
cc
cc
xx
登入功能完成

权限完善
登陆验证测试
登录验证完成
xx
添加会员和会员列表

初步完成添加会员和会员列表功能