Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_recognition
Fix for plane segmentation results into only one plane
add new nodelet to align two pointcloud based on ICP algorithm
Merge pull request #308 from garaemon/fix-multi-plane-segmentation-for-only-one-plane

Fix multi plane segmentation for only one plane
Merge pull request #309 from garaemon/simple-icp-registration

add new nodelet to align two pointcloud based on ICP algorithm
Merge remote-tracking branch 'refs/remotes/origin/master' into garaemon-joint-state-static-pointcloud-filter

Conflicts:
	jsk_pcl_ros/CMakeLists.txt
	jsk_pcl_ros/catkin.cmake
	jsk_pcl_ros/jsk_pcl_nodelets.xml