Merge pull request #293 from ros-planning/sachin-hydro

 automatically choosing table that the object is on
Merge branch 'hydro-devel' into sachin-hydro