Merge branch 'devByColin' into development
new、
Merge branch 'master' into development

Conflicts:
	PinChe/bin/PinChe.apk
	PinChe/bin/classes.dex
	PinChe/bin/classes/com/bobbygroup/pinche/MainActivity$1.class
	PinChe/bin/classes/com/bobbygroup/pinche/MainActivity$2.class
	PinChe/bin/classes/com/bobbygroup/pinche/MainActivity$3.class
	PinChe/bin/classes/com/bobbygroup/pinche/MainActivity$4.class
	PinChe/bin/classes/com/bobbygroup/pinche/MainActivity$5.class
	PinChe/bin/classes/com/bobbygroup/pinche/MainActivity.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiDetailActivity$1.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiDetailActivity$2.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiDetailActivity.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$1.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$2.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$3.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$4.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$5.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$6.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$7.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity$PoiGetBroadCast.class
	PinChe/bin/classes/com/bobbygroup/pinche/PoiListActivity.class
	PinChe/bin/classes/com/bobbygroup/pinche/R$drawable.class
	PinChe/bin/classes/com/bobbygroup/pinche/R$id.class
	PinChe/bin/classes/com/bobbygroup/pinche/R$layout.class
	PinChe/bin/classes/com/bobbygroup/pinche/R$string.class
	PinChe/bin/classes/com/bobbygroup/pinche/R$style.class
	PinChe/bin/classes/com/bobbygroup/pinche/Utils.class
	PinChe/bin/classes/com/bobbygroup/pinche/adapter/DetailListAdapter.class
	PinChe/bin/classes/com/bobbygroup/pinche/adapter/PoisListAdapter.class
	PinChe/bin/classes/com/bobbygroup/pinche/main/MyMapView.class
	PinChe/bin/resources.ap_
	PinChe/gen/com/bobbygroup/pinche/R.java