Merge pull request #43 from abubeck/feature/catkin

Feature/catkin
Merge pull request #45 from abubeck/feature/catkin

Feature/catkin
removed generation of mesh files
merge
Merge branch 'review320' into hydro_dev