Merge branch 'fuerte_dev' into groovy_dev
Merge branch 'groovy_dev' of git://github.com/ipa-nhg/cob_environments into groovy_dev
removed incorrect launch file entry (cob_orge was removed in groovy)
removed ogre dependency
Merge branch 'groovy_dev' of git://github.com/ipa-raw3-1/cob_environments into groovy_dev
move object locations to cob_default_env_config- groovy branch
Merge branch 'groovy_dev' of git://github.com/ipa320/cob_environments into groovy_dev
added prace logo texture
Merge pull request #27 from abubeck/feature/prace_textures

added prace logo texture
Merge branch 'groovy_dev' of https://github.com/ipa320/cob_environments into groovy_dev
Merge pull request #21 from ipa-nhg/groovy_dev

move object locations to cob_default_env_config- groovy branch
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