Merge pull request #65 from ipa-fxm/hydro_dev

bring groovy updates to hydro