Nao now stops when it is going to collide

It only does this once for now. Because there is no functionality to
solve the problem yet.
Merge branch 'master' of https://github.com/boschbc/NaoRobot

Conflicts:
	src/Sonar/Sonar.cs
	src/Util/NaoState.cs
Merge
Merge branch 'master' of https://github.com/boschbc/NaoRobot