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

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