Merge pull request #1 from robotics-in-concert/indigo

Interactions overhaul
Merge branch 'indigo' into hydro-devel