no update
Merge branch 'master' of https://github.com/ChinaWuxiandroid/chianwuxi_android

Conflicts:
	chinaw/bin/classes/com/wuxi/app/activity/BaseSlideActivity.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345ComplaintFragment$DeptAdapter.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIP12345ComplaintFragment.class
no update