bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZeroHeroRemake/bin/de/equinox/zerohero/entity/EntityManager.class
	ZeroHeroRemake/src/de/equinox/zerohero/entity/EntityManager.java
loggers