Merge pull request #30 from ipa-fxm/hydro_dev

Cleaning up, Catkinize and Make it work in Hydro