Merge pull request #1 from suntinghui/master

合并
11
Merge remote-tracking branch 'origin'
11
Merge pull request #2 from liaojia/master

解决返回主界面问题