Merge branch 'groovy-devel' of github.com:KaijenHsiao/pr2_object_manipulation into groovy-devel
switched to new shape msg; not yet compiled
finished port to new Shape message
more changes for migrating to Shape
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into shape-msg
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel
reverted to openni drivers by default, removed stack dependency on freenect
Merge pull request #33 from ros-interactive-manipulation/base_marker_fix

pr2_marker_control: make base_link clickable again
changes from main branch, renamed config file
Merge pull request #34 from mateiciocarlie/groovy-devel

Switched entire pipeline to new Shape message