fix to catkin
almost working

catkin sucks!!
working
Merge branch 'SDL-Hydro-catkin'