ServerWorldModel.java + ClientWorldModel.java basically
Merge branch 'master' of https://github.com/hanssonr/examensarbete

Conflicts:
	src/codename/core/src/main/java/se/rhel/screen/GameScreen.java
	src/codename/network/src/se/rhel/ClientTcpConnection.java
	src/codename/network/src/se/rhel/client/ClientUdpConnection.java
	src/codename/network/src/se/rhel/packet/PacketHandler.java
	src/codename/network/src/se/rhel/server/Server.java
	src/codename/network/src/se/rhel/server/TcpConnection.java