meins (reverse-merged from commit d7e2c69c0bec30d923f4117ed7a335307aff626b)
meins (reverse-merged from commit d7e2c69c0bec30d923f4117ed7a335307aff626b)
Strukturanpassungen (reverse-merged from commit cbc45fdfd7ccc7a47b406b35730d95339cb083de)
Strukturanpassungen (reverse-merged from commit cbc45fdfd7ccc7a47b406b35730d95339cb083de)
meins (reverse-merged from commit d7e2c69c0bec30d923f4117ed7a335307aff626b)
meins (reverse-merged from commit d7e2c69c0bec30d923f4117ed7a335307aff626b)
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	bin/graph/DefaultApp.class
	bin/graph/Graph.class
	src/entities/EntityCam.java
	src/graph/DefaultApp.java
	src/graph/Graph.java
	src/graph/traversal/Context.java
	src/graphBuilder/Camera.java
	src/graphBuilder/Group.java
	src/graphBuilder/Light.java
	src/graphBuilder/Shape.java
	src/physics/Body.java
	src/physics/World.java
	src/shapeBuilder/CubeMesh.java