changed pr2_marker_control behaviour: not doing a full reset when menus change, instead calling reApply
changed pr2_marker_control behaviour: only resetting control markers on controller change
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel
call initControlMarkers on upper arm click
added re-init control markers when switching controllers
marker_control: make only clickable links buttons, non-interactive otherwise
made launchfiles non-executable
Merge branch 'groovy-devel' of github.com:jon-weisz/pr2_object_manipulation into groovy-devel
addition to #25: use arg instead of group for freenect/openni.
Update manipulation/pr2_marker_control/src/marker_control.cpp
bugfix for #23: enable kinect by default
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel
Update manipulation/pr2_object_manipulation_launch/manifest.xml

depend on freenect_stack to make sure it gets built, since we are currently building it from source.
Update manipulation/pr2_object_manipulation_launch/manifest.xml
Update stack.xml
Merge pull request #26 from dgossow/groovy-devel

bugfix for #23: enable kinect by default
took out dependencies on freenect and changed default back to openni (at Matei's request)
Merge pull request #28 from KaijenHsiao/groovy-devel

took out dependencies on freenect and changed default back to openni
im frontend: renamed rviz config file, moved robot display to debug group
pr2_marker_control: make base_link clickable again