minor changes
Merge branch 'exp-245' of github.com:simplay/Bachelor-Thesis into exp-245

Conflicts:
	simple/src/Diffraction/DiffractionSceneGraphFabricator.java
removed merging crap