sync
Merge remote-tracking branch 'origin/Testing' into Testing

Conflicts:
	bin/spel/entities/Player.class