updates

updates
updates
aa

aa
Merge branch 'master' of https://github.com/tiarsoft/PonyRace-P

Conflicts:
	PonyRace-android/bin/ponyrace-android.jar
	PonyRace/bin/com/tiarsoft/ponyrace/Settings.class
	PonyRace/bin/com/tiarsoft/ponyrace/screens/ShopScreen$17.class
	PonyRace/bin/com/tiarsoft/ponyrace/screens/ShopScreen$18.class
	PonyRace/bin/com/tiarsoft/ponyrace/screens/ShopScreen$19.class
	PonyRace/bin/com/tiarsoft/ponyrace/screens/ShopScreen$20.class
	PonyRace/bin/com/tiarsoft/ponyrace/screens/ShopScreen.class