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

Upgraded conductor graph
Merge branch 'indigo' into hydro-devel