odometry for floordetection
Merge branch 'master' into camusb

Conflicts:
	robot_controller.cpp