内容列表加入缓存，政务大厅部分布局修改
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android

Conflicts:
	chinaw/bin/chinaw.apk
	chinaw/bin/classes.dex
	chinaw/bin/classes/com/wuxi/app/MainTabActivity.class
	chinaw/bin/classes/com/wuxi/app/R$id.class
	chinaw/bin/classes/com/wuxi/app/R$layout.class
	chinaw/bin/classes/com/wuxi/app/R$menu.class
	chinaw/bin/classes/com/wuxi/app/R$string.class
	chinaw/bin/classes/com/wuxi/app/R$style.class
	chinaw/bin/classes/com/wuxi/app/activity/MainIndexActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/goversaloon/GoverSaloonDetailCFActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/goversaloon/GoverSaloonDetailQTActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/goversaloon/GoverSaloonDetailQZActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/goversaloon/GoverSaloonDetailXKActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/goversaloon/GoverSaloonDetailZSActivtiy.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/logorregister/RegisterActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/more/SystemSetActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/mygoverinteractpeople/ForumContentActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/mygoverinteractpeople/GIP12345AllMailContentActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/mygoverinteractpeople/HotReviewContentActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/mygoverinteractpeople/LegislationContentActivity.class
	chinaw/bin/classes/com/wuxi/app/activity/homepage/mygoverinteractpeople/PepoleIdeaCollectActivity.class
	chinaw/bin/classes/com/wuxi/app/adapter/ContentChannelAdapter.class
	chinaw/bin/classes/com/wuxi/app/adapter/ContentNavigatorAdapter.class
	chinaw/bin/classes/com/wuxi/app/adapter/GoverInteractPeopleNevigationAdapter.class
	chinaw/bin/classes/com/wuxi/app/adapter/VideoGuestPresenceAdapter.class
	chinaw/bin/classes/com/wuxi/app/engine/ContentService.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/fantasticwuxi/CityMapFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/fantasticwuxi/WuxiChannelContentFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goverpublicmsg/GoverMsgApplyDownloadFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goverpublicmsg/GoverMsgSubChannelsSearchFragment$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goverpublicmsg/GoverMsgSubChannelsSearchFragment$ChannelGridViewAdaptger.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goversaloon/AdministrativeItemFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goversaloon/GoverMangeFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goversaloon/MyGoverSaloonFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goversaloon/TableDownloadsFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345ComplaintFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345MayorMaiBoxFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPMineInfoPublicPlatformFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverInterPeopleVideoLiveHomeFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverMenuItemTitleFragment$2.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GoverMenuItemTitleFragment$GridViewAdaptger.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/publicservice/PublicServiceChannelContentDetailFragment.class
	chinaw/bin/classes/com/wuxi/app/view/DynamicTitleLayout$TitleItemlOnclick.class
	chinaw/bin/classes/com/wuxi/app/view/TitleScrollLayout$TitleItemlOnclick.class
	chinaw/bin/resources.ap_
	chinaw/src/com/wuxi/app/engine/ContentService.java