Merge remote-tracking branch 'refs/remotes/origin/master' into add-auto-color-changing-feature-to-plotters

Conflicts:
	jsk_rviz_plugins/src/plotter_2d_display.cpp
	jsk_rviz_plugins/src/plotter_2d_display.h