Merge pull request #7 from ipa320/hydro_dev

update from ipa320
update changelog
add maintainer
update changelog
0.5.4
Merge pull request #120 from ipa-fxm/indigo_dev

Indigo dev
Merge pull request #121 from ipa320/indigo_release_candidate

Indigo release candidate
Merge branch 'indigo_dev' into velocity_interface_controller_indigo
catkin_lint'ing
Merge branch 'indigo_dev' into velocity_interface_controller_indigo
Merge pull request #122 from ipa-fxm/indigo_dev

catkin_lint'ing
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 'indigo_dev' into velocity_interface_controller_indigo
Merge branch 'indigo_dev' of github.com:ipa-fxm/cob_common into velocity_interface_controller_indigo
Merge branch 'velocity_interface_controller_indigo' of github.com:ipa-fxm/cob_common into velocity_interface_controller_indigo
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