checked all sprites, level and levelscene
Merge remote-tracking branch 'origin/develope' into develope

Conflicts:
	src/competition/cig/johannkirchkesner/simulator/Node.java
	src/competition/cig/johannkirchkesner/simulator/Simulator.java