Merge remote-tracking branch 'origin/master'

Conflicts:
	Driver/AndroidManifest.xml
	Driver/bin/AndroidManifest.xml
	Driver/bin/Driver.apk
	Driver/bin/classes.dex
	Driver/bin/classes/ustc/sse/water/activity/DriverLife.class
	Driver/bin/classes/ustc/sse/water/activity/DriverMainScreen.class
	Driver/bin/classes/ustc/sse/water/activity/R$drawable.class
	Driver/bin/classes/ustc/sse/water/activity/R$id.class
	Driver/bin/classes/ustc/sse/water/activity/R$layout.class
	Driver/bin/classes/ustc/sse/water/activity/R$string.class
	Driver/bin/classes/ustc/sse/water/activity/R$style.class
	Driver/bin/classes/ustc/sse/water/activity/R.class
	Driver/bin/classes/ustc/sse/water/adapter/zjx/DriverLifeAdapter.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/MyLocationSet.class

	Driver/bin/classes/ustc/sse/water/tools/zjx/PoiAroundSearchMethod$1.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/PoiAroundSearchMethod.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/PoiSearchMethod$1.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/PoiSearchMethod.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/VoiceSearch$1.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/VoiceSearch$2.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/VoiceSearch.class
	Driver/bin/classes/ustc/sse/water/utils/zjx/ToastUtil.class
	Driver/bin/resources.ap_
	Driver/gen/ustc/sse/water/activity/R.java
	Driver/libs/armeabi/libmsc.so
	Driver/src/ustc/sse/water/tools/hzh/NaviRouteMethod.java