Merge pull request #34 from abubeck/feature/catkin

Upstream changes from groovy_dev
Merge pull request #35 from abubeck/hydro_dev

Changes for hydro compatibility
New wall textures and floor for ipa-apartment environment
Merge pull request #36 from ipa-nhg/groovy_dev

New wall and floor textures
remove debug tag
Merge branch 'groovy_dev' of github.com:ipa320/cob_environments into review320_catkin
Merge branch 'review320_catkin' into hydro_dev
Created new objects
Changed name medication_prospan to medicine_prospan and moved the default camera position
Merge pull request #37 from ipa-nhg/groovy_dev

Created new objects
Merge branch 'groovy_dev' of git://github.com/ipa320/cob_environments into hydro_dev
Created specific empty world for ipa environments
Created empty world launch file
Created specific empty world for ipa environments
Corrected xacro warning in hydro.
Merge pull request #40 from ipr-sr2/xacro_hydro_correction

Corrected xacro warning in hydro.
Merge pull request #38 from ipa-nhg/hydro_dev

Hydro dev
changes for textures
merged