Various fixes
Merge branch 'master' of https://github.com/chudooder/FEMultiplayer.git

Conflicts:
	src/net/fe/overworldStage/ClientOverworldStage.java