-
Merge branch 'master' of
git@github.com:mephistopheles42/java-jumpandrun-dev.git

Conflicts:
	core/src/main/java/de/secondsystem/game01/impl/game/entities/IGameEntity.java