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
..
in
selfbuilt
agreement.css
animate.min.css
base.css
base1.css
business.css
collaborate.css
common.css
dialog_base.css
down.css
download.css
foot.css
game.css
gamecenter.css
gift.css
global.css
heard.css
home.css
home_login.css
home_register.css
iconfont.css
index.css
index_about.css
jftbase.css initial
jftindex.css
jftstyle.css
jianhu.css
login.css
main_pq.css
new.css
news.css
pay.css
pig.css
product.css
profile.css
public.css
recharge.css
reg.css
reset.css
resetpwd.css
safe.css
service.css
service11.css
style.css
sub.css
supervise.css Merge branch 'dev' into dev_lww
swiper.min.css
user.css
viewer.min.css
webuploader.css