test
Merge fix

Merge branch 'master' of https://github.com/SfZBadSaulgau/RoboSim

Conflicts:
	GUI_C/RoboSim/robosim.cpp