oops
Merge pull request #125 from robotics-in-concert/typo

oops
Merge pull request #126 from robotics-in-concert/indigo

[remocon] remappings for global executables
Merge branch 'hydro-devel' of https://github.com/robotics-in-concert/rocon_qt_gui into hydro-devel
ensure link type updates when important state changes happen, fixes #128.
rocon_admin_app: CMakeLists.txt(52): error: duplicate catkin_package() and cmake cleanup
concert_conductor_graph: CMakeLists.txt(52): error: duplicate catkin_package and cleanup
Merge pull request #132 from robotics-in-concert/lintwork

Lintwork
Merge branch 'indigo' into hydro-devel