+fix thread
Merge branch 'master' into net

Conflicts:
	Rania/src/com/game/rania/screen/LocationScreen.java