Merge pull request #1 from ubi-agni/hydro-devel

minor catkin fixes