Småfixar
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/codename/core/src/main/java/se/rhel/model/server/ServerWorldModel.java
Småfixar, Log level sätts i core istället