Merge branch 'master' into crosbot_gpu_dev

Conflicts:
	crosbot_ogmbicp/include/crosbot_ogmbicp/Ogmbicp.hpp
	crosbot_ogmbicp/include/crosbot_ogmbicp/OgmbicpCPU.hpp
	crosbot_ogmbicp/include/crosbot_ogmbicp/OgmbicpNode.hpp
	crosbot_ogmbicp/src/OgmbicpNode.cpp