添加前天配置界面
Merge branch 'master' of https://github.com/wanghongbo/GameCenter

Conflicts:
	source/game/src/main/webapp/html/master-page.html
删除多余配置文件
Merge branch 'master' of https://github.com/wanghongbo/GameCenter