liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
..
Article Merge branch 'dev' into dev_lww
Base initial
Category initial
Game pc端问题反馈修改
Gift initial
Index 官网超级签不可点击
Member initial
Public pc官网-公司logo可点击跳首页
Recharge 解绑手机
Search initial
Selfbuilt initial
Service pc官网 客服中心,搜索框,字体异常
Share initial