Merge branch 'fence_mapping', remote-tracking branch 'origin/fence_mapping' into fence_mapping
New calibrations for the mainpulator pair