Merge pull request #1 from yuhongjie/beta

Merge pull request #1 from liugu/beta
Merge pull request #2 from liugu/master

首页
Merge pull request #2 from liugu/beta

Merge pull request #1 from yuhongjie/beta