STH
Merge pull request #2 from liaojia/master

解决返回主界面问题
Merge pull request #2 from suntinghui/master

test