Merge pull request #65 from ipa-fxm/hydro_dev

bring groovy updates to hydro + make it work
Merge pull request #67 from ipa-fxm/hydro_dev

Optimize control