sync
Merge branch 'Testing' of https://github.com/Trisslotten/gameEngine into Testing

Conflicts:
	bin/spel/entities/Player.class
	bin/spel/entities/gui/SpriteCollection.class
Merge branch 'Testing' of https://github.com/Trisslotten/gameEngine into Testing