Merge branch 'indigo_dev' of https://github.com/ipa320/cob_robots into indigo_dev
Merge branch 'indigo_dev' of github.com:iirob/cob_robots into indigo_dev