1
Merge branch 'master' of github.com:johnnyeven/xgame-server-java

Conflicts:
	GameServer/src/com/xgame/server/game/map/Map.java