Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
add end effector controller interface
use load_manifest on groovy
use load_manifest on groovy
add import statement
rename plugin scripts to avoid msg import bug
add dependancy on jsk_interactive_marker
send 'move' when circle button is pushed
Merge branch 'master' into add-plugin-for-jsk-interactive-marker

Conflicts:
	jsk_teleop_joy/src/jsk_teleop_joy/camera_view.py
use triangle button to send menu
add method to change move arm
Merge branch 'add-plugin-for-jsk-interactive-marker', remote-tracking branch 'tarukosu/add-plugin-for-jsk-interactive-marker' into add-plugin-for-jsk-interactive-marker
add method to set pose
transform PoseStamped when setting marker pose
Merge branch 'add-plugin-for-jsk-interactive-marker' of github.com:tarukosu/jsk_control into add-plugin-for-jsk-interactive-marker
add button to control interactive marker
Merge branch 'add-plugin-for-jsk-interactive-marker' of github.com:tarukosu/jsk_control into add-plugin-for-jsk-interactive-marker
modify launch file
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_control
Merge branch 'master' into add-plugin-for-jsk-interactive-marker

Conflicts:
	jsk_teleop_joy/manifest.xml
	jsk_teleop_joy/package.xml
	jsk_teleop_joy/src/jsk_teleop_joy/plugin/joy_pose_6d.py