Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_visualization into add-baxter-to-ik-controllers

Conflicts:
	jsk_interactive_markers/jsk_interactive_marker/euslisp/ik-controller.l