as
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/de/potoopirate/alf/systems/ClientSystem.java