2014-11-14

UTF-8修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	Driver/bin/classes/ustc/sse/water/activity/DriverMainScreen.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/tools/zjx/MyLocationSet.class