changes for hydro
Merge branch '320catkin' into hydro_dev
Merge pull request #76 from abubeck/hydro_dev

Hydro dev