reverted changes to marker control
Merge branch 'hookup-rviz-buttons' of github.com:jon-weisz/pr2_object_manipulation into hookup-rviz-buttons
really rolled back changes to marker control this time