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
..
Common initial
Conf initial
Controller pc热门游戏显示从推荐改为热门
Event initial
Lang initial
Logic initial
Model initial
View/default Merge branch 'dev' into dev_lww
Widget initial