Update Gerard

bluetoooth test
Merge branch 'master' of https://github.com/ErasmusMC-BME/RobotControl

Conflicts:
	RobotApp.cpp
	Threading/NIGLegoThread.txx