Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_visualization
add include for catkin
rename config file
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_visualization
Merge branch 'master' into interactive-point-cloud-catkin

Conflicts:
	jsk_interactive_markers/jsk_interactive_marker/catkin.cmake
Merge pull request #131 from tarukosu/interactive-point-cloud-catkin

catkinize Interactive point cloud