Merge branch 'groovy_dev' of github.com:ipa-raw3-1/cob_calibration_data into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa320/cob_calibration_data into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa-cob3-5/cob_calibration_data into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa-nhg/cob_calibration_data into groovy_dev

Conflicts:
	cob3-5/calibration/calibration_offset.urdf.xacro
Merge branch 'groovy_dev' of github.com:ipa-nhg/cob_calibration_data into groovy_dev
merge
Merge branch 'groovy_dev' of github.com:ipa-nhg/cob_calibration_data into groovy_dev

Conflicts:
	cob3-5/calibration/calibration_default.urdf.xacro
fix merge
merge fix
merge fix
Added calibration parameter for ur_connector
Merge branch 'groovy_dev' of https://github.com/ipa320/cob_calibration_data into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa-nhg/cob_calibration_data into groovy_dev
Merge branch 'groovy_dev' of https://github.com/ipa-cob3-5/cob_calibration_data into groovy_dev
Last calibration update (cob3-3)
Merge branch 'groovy_dev' of http://github.com/ipa-nhg/cob_calibration_data into stable
Merge branch 'groovy_dev' of https://github.com/ipa320/cob_calibration_data into merge
Merge pull request #37 from ipa-nhg/merge

Merge from cob3-3 calibration user