修正主界面bug
Merge branch 'dev_v2' of https://github.com/tecle/AndroidProject1 into dev_v2
修正Manifest