new calibration
Merge branch 'master' of github.com:ipa-fmw-ja/cob_calibration_data

Conflicts:
	cob3-6/calibration/calibration.urdf.xacro