simulate konstrukt ready
Merge branch 'origin/test'

Conflicts:
	src/app/WorldState.java
	src/app/eventsystem/Types.java