Merge pull request #7 from ipa320/hydro_dev

update from ipa320
Merge pull request #8 from ipa320/hydro_dev

update from ipa320
Deleting s300 stl mesh because the dae file is used
Merge pull request #123 from ipa-fmw/hydro_dev

Deleting s300 stl mesh because the dae file is used
Merge branch 'hydro_dev' of github.com:ipa-fxm/cob_common into velocity_interface_controller
Merge branch 'hydro_dev' of github.com:ipa-fxm/cob_common into indigo_dev
Merge branch 'indigo_dev' of github.com:ipa-fxm/cob_common into velocity_interface_controller_indigo
Merge branch 'velocity_interface_controller' of github.com:ipa-fxm/cob_common into velocity_interface_controller_indigo