calib red
loc
Merge branch 'master' of https://github.com/boschbc/NaoRobot

Conflicts:
	src/communication/GoalCommunicator.cs
Merge branch 'master' of https://github.com/boschbc/NaoRobot