* remove jsk_interactive_marker.launch and integrate it to pr2.launch
* rewrite jsk_interactive_marker plugin to modern plugin style
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
Merge branch 'master' into fix-jsk-interactive-marker-plugin

Conflicts:
	jsk_teleop_joy/launch/pr2.launch
circle button to move arm
Merge pull request #60 from garaemon/fix-jsk-interactive-marker-plugin

update jsk_interactive_marker joystick plugin