Merge pull request #9 from ipa-fxm/groovy_dev

Tested on cob3-3
Merge pull request #11 from ipa-fxm/hydro_dev

catkinize and cleanup