Merge branch 'strobmir'

diff --cc src/robofsm/fsmmove.cc
Simple merge

diff --cc src/robofsm/homologation.cc
Simple merge

diff --cc src/robofsm/motion-control.cc
Simple merge

diff --cc src/robofsm/movehelper.cc
Simple merge

diff --cc src/robofsm/robot_orte.c
Simple merge