收藏开发
no update
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/fragment/homepage/mygoverinteractpeople/GIPMine12345Fragment$3.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPMine12345Fragment$LettersListViewAdapter$ViewHolder.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPMine12345Fragment$LettersListViewAdapter.class
	chinaw/bin/classes/com/wuxi/app/fragment/homepage/mygoverinteractpeople/GIPMine12345Fragment.class
	chinaw/bin/dexedLibs/android-support-v4-d96341a908320693b1279bce98796b8a.jar
	chinaw/bin/dexedLibs/baidumapapi_v2_1_2-103c3e776384da409f12871cc7505ce7.jar
	chinaw/bin/dexedLibs/gson-2.2.2-5363ba481eddf8c7efcab00d686f11c8.jar
	chinaw/bin/dexedLibs/locSDK_3.1-c7791016cd6b192f536ac2e4a8ec4520.jar
	chinaw/bin/resources.ap_