Merge branch 'indigo' into teleop_app_patch
Merge branch 'indigo' of https://github.com/robotics-in-concert/rocon_qt_gui into indigo
Merge branch 'indigo' of https://github.com/robotics-in-concert/rocon_qt_gui into indigo