Merge pull request #131 from ipa-fxm/hydro_dev

Optimize control
New cob3-3 calibration
Merge pull request #139 from ipa-nhg/hydro_dev

New cob3-3 calibration