no update
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/fragment/homepage/goverpublicmsg/GoverMsgWebFragment$1.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/goverpublicmsg/GoverMsgWebFragment.class
	chinaw/bin/resources.ap_