Merge branch 'groovy_dev' of https://github.com/ipa320/cob_environments into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa320/cob_environments into groovy_dev
Addapted .dae files for new gazebo version
cleanup deps
add object locations for empty world
Merge pull request #29 from ipa-nhg/collada_support

Collada support
Merge pull request #6 from ipa320/groovy_dev

merging ipa-fmw
Merge pull request #31 from ipa-fmw/groovy_dev

merging ipa-fmw to ipa320
Merge pull request #7 from ipa320/groovy_dev

merging ipa320 to ipa-fmw
Merge pull request #32 from ipa-fmw/groovy_dev

merging ipa-fmw to ipa320
remove not supported environment ipa-maze
Merge branch 'groovy_dev' of github.com:ipa-fmw/cob_environments into groovy_dev
Merge pull request #33 from ipa-fmw/groovy_dev

-mremove ipa-maze
merged with upstream ipa320
Merge pull request #34 from abubeck/feature/catkin

Upstream changes from groovy_dev