v 1108

添加一些UI元素
Merge remote-tracking branch 'origin/master'

Conflicts:
	VirtualBike/assets/cities.xml