1221

yun finish
Merge remote-tracking branch 'origin/nmaster' into nmaster

Conflicts:
	Driver/bin/Driver.apk
	Driver/bin/classes.dex
	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/adapter/zjx/DriverLifeAdapter.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/PoiAroundSearchMethod.class
	Driver/bin/classes/ustc/sse/water/tools/zjx/PoiSearchMethod.class
	Driver/bin/resources.ap_
	Driver/gen/ustc/sse/water/activity/R.java
1221_1