jhgjh
Merge branch 'master' of https://github.com/rockztar/NewRPGAndroidGame

Conflicts:
	src/mnr/newrpg/androidgame/GameThread.java