收藏开发
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/activity/MainIndexActivity.class
	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/commonfragment/FifterContentListFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goverpublicmsg/GoverMsgApplyDownloadFragment.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345MayorMaiBoxFragment$7.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPSuggestLawSuggestionFragment.class
	chinaw/bin/classes/com/wuxi/app/util/Constants$Urls.class
	chinaw/bin/resources.ap_
收藏功能基本实现，解决魅力锡城4.0以上APPbug