kjfaskl
Merge branch 'master' of https://github.com/dmillard/tum_simulator

Conflicts:
	cvg_sim_gazebo/Media/models/grid.dae
	cvg_sim_gazebo/Media/models/material_1.png
	cvg_sim_gazebo/urdf/grid.urdf.xacro