updates

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

Conflicts:
	PonyRace-android/bin/ponyrace-android.jar