Merge branch 'humble' into hcoelho

diff --cc CMakeLists.txt
Simple merge

diff --cc package.xml
index a54aa9d,9255ea2..0446b3c
--- 1/package.xml
--- 2/package.xml
+++ b/package.xml
@@@ -1,20 -1,20 +1,20 @@@
  <?xml version="1.0"?>
  <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
  <package format="3">
 -  <name>ufrgs_gazebo</name>
 -  <version>2.0.0</version>
 -  <description>UFRGS Worlds package</description>
 -  <maintainer email="fetter@ece.ufrgs.br">Walter Fetter Lages</maintainer>
 -  <license>GPLv3</license>
 +    <name>ufrgs_gazebo</name>
 +    <version>2.0.0</version>
 +    <description>UFRGS Worlds package</description>
 +    <maintainer email="fetter@ece.ufrgs.br">Walter Fetter Lages</maintainer>
 +    <license>GPLv3</license>
  
 -  <buildtool_depend>ament_cmake</buildtool_depend>
 +    <buildtool_depend>ament_cmake</buildtool_depend>
  
 -  <test_depend>ament_lint_auto</test_depend>
 -  <test_depend>ament_lint_common</test_depend>
 +    <test_depend>ament_lint_auto</test_depend>
 +    <test_depend>ament_lint_common</test_depend>
  
-     <export>
-         <build_type>ament_cmake</build_type>
-         <gazebo_ros gazebo_worlds_path="${prefix}/.." />
-         <gazebo_ros gazebo_model_path="${prefix}/models" />
-     </export>
+   <export>
+     <build_type>ament_cmake</build_type>
+     <gazebo_ros gazebo_model_path="${prefix}/.."/>
+     <gazebo_ros gazebo_resource_path="${prefix}/.."/>
+   </export>
  </package>