v11.1

可定位及计算出最近五个站点
Merge remote-tracking branch 'origin/master'

Conflicts:
	VirtualBike/assets/cities.xml