simpler collision geometries
Merge branch 'groovy_dev' of github.com:ipa-raw3-1/universal_robot into groovy_dev