Merge pull request #103 from ipa-fxm/groovy_dev

Groovy dev
Merge branch 'hydro_dev' into groovy_dev