Merge branch 'groovy_dev' of github.com:ipa-raw3-1/cob_calibration_data into groovy_dev
Added calibration datas for powerball
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
update calibration for cob3-5
merge
new prosilica camera calibration
changed calibration of camera head
Merge branch 'groovy_dev' of https://github.com/ipa-raw3-1/cob_calibration_data into groovy_dev
changed camera calibration
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