gah
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/codename/core/src/main/java/se/rhel/network/controller/ServerController.java
Annorlunda event, bättre? Oklart.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/codename/core/src/main/java/se/rhel/network/controller/ServerController.java
	src/codename/core/src/main/java/se/rhel/network/model/ServerWorldModel.java
Annorlunda event, bättre? Oklart. -- MERGE