2014-11-27

汽车服务
Merge remote-tracking branch 'origin/master'

Conflicts:
	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/search/hzh/SearchPosition.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/src/ustc/sse/water/activity/DriverMainScreen.java
Merge branch 'master' of https://github.com/ustc2hz/DriverApp

Conflicts:
	Driver/bin/classes/ustc/sse/water/search/hzh/SearchPosition.class