Merge branch 'review320' into feature/catkin
Merge branch 'feature/catkin' of github.com:abubeck/cob_calibration_data into feature/catkin