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

Interactions overhaul
Merge branch 'hydro-devel' into indigo