Merge remote-tracking branch 'origin-ipa320/master' into automerge
Merge branch 'groovy-rosbuild' of https://github.com/ipa-nhg/cob_environments into groovy-rosbuild
New groovy-rosbuild branch
ogre_tools is now a system dependency - remove depend package
Merge pull request #2 from ipa320/groovy_dev

Groovy dev
Merge pull request #15 from ipa-nhg/groovy_dev

Groovy dev
Merge branch 'groovy_dev' of github.com:ipa320/cob_environments into groovy_dev
New empty_world version for groovy
Merge branch 'groovy_dev' of git://github.com/ipa-nhg/cob_environments into groovy_dev
Merge branch 'fuerte_dev' into groovy_dev
Merge branch 'groovy_dev' of github.com:ipa-bnm/cob_environments into groovy_dev
fix environment descriptions according to new gazebo format
some cleaning up
fixed copy paste error
Merge pull request #23 from ipa-fxm/groovy_gazebo

Groovy Updates for gazebo simulation
converted deprecated empty.world to latest sdf format 1.3 - by using 'save world as' in gazebo
Merge branch 'electric_dev' of github.com:ipa320/cob_environments into groovy_gazebo
removing ipa-maze
removing obsolete files
removing obsolete files