Ändrad struktur, ny level, transition borta för tillfället
IML FILER!!!
Merge branch 'master' of https://github.com/hanssonr/examensarbete

Conflicts:
	src/codename/core/src/main/java/se/rhel/model/WorldModel.java
	src/codename/core/src/main/java/se/rhel/screen/LoadingScreen.java
	src/codename/desktop/desktop.iml