123
Merge remote-tracking branch 'origin/master'

Conflicts:
	Driver/bin/AndroidManifest.xml
	Driver/bin/Driver.apk
	Driver/bin/classes.dex
	Driver/bin/classes/ustc/sse/water/activity/BuildConfig.class
	Driver/bin/classes/ustc/sse/water/activity/DriverMainScreen.class
	Driver/bin/classes/ustc/sse/water/activity/R$attr.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/json/zjx/VoiceJsonParser.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/MyLocationSet.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/resources.ap_