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
Merge pull request #58 from abubeck/feature/catkin

compiling but still some linker errors
Merge pull request #61 from abubeck/feature/catkin

Feature/catkin
Merge pull request #62 from abubeck/feature/catkin

Feature/catkin
Merge pull request #67 from abubeck/feature/catkin

Feature/catkin
fix for oodl
Merge pull request #5 from ipa320/groovy_catkin

oodl updates