2111111111111
Merge branch 'xiongchao'
Merge branch 'master' of https://github.com/y390981782/test

Conflicts:
	App/Modules/Admin1/Action/GameAction.class.php
	App/Modules/Admin1/Tpl/Game/index.html
22222
Merge branch 'master' of https://github.com/y390981782/test into xiongchao

Conflicts:
	App/Modules/Admin1/Action/GameAction.class.php
	App/Modules/Admin1/Tpl/Game/index.html
1111111111111
Merge branch 'xiongchao'

Conflicts:
	App/Modules/Admin1/Action/GameAction.class.php
	App/Modules/Admin1/Tpl/Game/index.html
	App/Modules/Admin1/Tpl/Seller/add.html