solve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	3D Simulation/ParticleSimulation-Core/src/ch/zhaw/da/thb/ps/Runner.java