cob_sick_s300: changes from Jan Paulus, BRSU
Merge pull request #45 from ipa-mig/electric_dev

cob_sick_s300: changes from Jan Paulus, BRSU
Merge pull request #47 from ipa-fmw/master

add diagnostics to sound
Merge remote-tracking branch 'origin/electric_dev' into groovy_dev
Merge remote-tracking branch 'origin/groovy_dev' into groovy_dev
Merge pull request #59 from ipa-cob3-5/groovy_dev

-mImplemented feature X