merge cob4
Merge pull request #84 from ipa-nhg/hydro_dev

merge cob4
Merge branch 'hydro_dev' of git://github.com/ipa320/cob_common into hydro_dev