缓存修改
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android
解决冲突。。。
Conflicts:
	chinaw/bin/AndroidManifest.xml
	chinaw/bin/chinaw.apk
	chinaw/bin/classes.dex
	chinaw/bin/classes/com/wuxi/app/activity/homepage/more/MenuItemSetActivity$MenuSetAdapter.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/more/MenuItemSetActivity.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPContentFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverInterPeopleVideoLiveFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverMenuItemTitleFragment$3.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverMenuItemTitleFragment$4.class
	chinaw/bin/proguard.txt
	chinaw/bin/resources.ap_
	chinaw/src/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPContentFragment.java
	chinaw/src/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverInterPeopleVideoLiveFragment.java