diff --git a/ca_description/urdf/common_properties.xacro b/ca_description/urdf/common_properties.xacro
index 8db810ddb..d2e8bad17 100644
--- a/ca_description/urdf/common_properties.xacro
+++ b/ca_description/urdf/common_properties.xacro
@@ -4,8 +4,7 @@
-
-
+
diff --git a/ca_description/urdf/create_2.xacro b/ca_description/urdf/create_2.xacro
index 3c33de879..6b6e17cb8 100644
--- a/ca_description/urdf/create_2.xacro
+++ b/ca_description/urdf/create_2.xacro
@@ -17,5 +17,5 @@
-
+
diff --git a/ca_description/urdf/create_base.xacro b/ca_description/urdf/create_base.xacro
index 59e5a1550..1f8df74f7 100644
--- a/ca_description/urdf/create_base.xacro
+++ b/ca_description/urdf/create_base.xacro
@@ -52,7 +52,12 @@
-
+
+
+
+
+
+
diff --git a/ca_description/urdf/create_caster_wheel.xacro b/ca_description/urdf/create_caster_wheel.xacro
index 439406ecd..6df1fdb83 100644
--- a/ca_description/urdf/create_caster_wheel.xacro
+++ b/ca_description/urdf/create_caster_wheel.xacro
@@ -1,34 +1,25 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
@@ -36,8 +27,8 @@
-
-
+
+
diff --git a/ca_description/urdf/sensors/cliff_sensors.xacro b/ca_description/urdf/sensors/cliff_sensors.xacro
index 36f2db6bd..d70afa9a4 100644
--- a/ca_description/urdf/sensors/cliff_sensors.xacro
+++ b/ca_description/urdf/sensors/cliff_sensors.xacro
@@ -37,21 +37,13 @@
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
diff --git a/ca_description/urdf/sensors/wall_sensor.xacro b/ca_description/urdf/sensors/wall_sensor.xacro
index 01e88f934..52aab61e3 100644
--- a/ca_description/urdf/sensors/wall_sensor.xacro
+++ b/ca_description/urdf/sensors/wall_sensor.xacro
@@ -21,9 +21,7 @@
-
-
-
+
diff --git a/ca_gazebo/launch/create_cooperative_two_rooms.launch b/ca_gazebo/launch/create_cooperative_two_rooms.launch
index 75d352890..25018a51e 100644
--- a/ca_gazebo/launch/create_cooperative_two_rooms.launch
+++ b/ca_gazebo/launch/create_cooperative_two_rooms.launch
@@ -1,11 +1,16 @@
-
-
+
+
-
-
-
+
+
+
+
+
+ [create1, create2]
+
+
diff --git a/ca_gazebo/launch/create_empty_world.launch b/ca_gazebo/launch/create_empty_world.launch
index 6e2eafb79..17dd791e2 100644
--- a/ca_gazebo/launch/create_empty_world.launch
+++ b/ca_gazebo/launch/create_empty_world.launch
@@ -32,7 +32,7 @@
-
diff --git a/ca_gazebo/launch/spawn_multirobot.launch b/ca_gazebo/launch/spawn_multirobot.launch
index 243197f0a..e9f649886 100644
--- a/ca_gazebo/launch/spawn_multirobot.launch
+++ b/ca_gazebo/launch/spawn_multirobot.launch
@@ -22,7 +22,7 @@
-
+
diff --git a/ca_gazebo/worlds/two_rooms.world b/ca_gazebo/worlds/two_rooms.world
index d2eeb7f72..160502234 100644
--- a/ca_gazebo/worlds/two_rooms.world
+++ b/ca_gazebo/worlds/two_rooms.world
@@ -31,1063 +31,94 @@
-0.5 0.1 -0.9
-
-
- 1
-
-
-
-
- 0 0 1
- 100 100
-
-
-
-
-
- 100
- 50
-
-
-
-
-
-
-
- 10
-
-
- 0
-
-
- 0 0 1
- 100 100
-
-
-
-
-
-
-
- 0
- 0
-
- 0
- 0
- 1
-
-
-
- 0
-
-
- 1
- 0 0 0 0 -0 0
-
- 0.002741 -0.017964 1.2465 0 -0 0
- 0
- 0
- 0
-
- 0 0 0 0 -0 0
-
-
- 0.9 0.078144 2.51204
-
-
-
- 1
-
-
- 0 0 0 1
-
- 0
- 1
-
-
- 0
- 10
- 0 0 0 0 -0 0
-
-
- 0.9 0.078144 2.51204
-
-
-
-
-
- 0.2
- 0.2
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
-
-
- 1
-
- -1.425 1.425 -0 0 -0 1.5708
-
- 2250
- 0 0 0 0 -0 0
-
- 1176.09
- 0
- 0
- 2859.38
- 0
- 1691.72
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- 0 2.85 -0 0 -0 0
-
- 2250
- 0 0 0 0 -0 0
-
- 1176.09
- 0
- 0
- 2859.38
- 0
- 1691.72
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- 1.425 1.425 -0 0 0 -1.5708
-
- 2250
- 0 0 0 0 -0 0
-
- 1176.09
- 0
- 0
- 2859.38
- 0
- 1691.72
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- 1.425 -1.425 0 0 0 -1.5708
-
- 2250
- 0 0 0 0 -0 0
-
- 1176.09
- 0
- 0
- 2859.38
- 0
- 1691.72
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- 0 -2.85 0 0 -0 3.14159
-
- 2250
- 0 0 0 0 -0 0
-
- 1176.09
- 0
- 0
- 2859.38
- 0
- 1691.72
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- -1.425 -1.425 0 0 -0 1.5708
-
- 2250
- 0 0 0 0 -0 0
-
- 1176.09
- 0
- 0
- 2859.38
- 0
- 1691.72
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
- 0.7 0.7 0.7 1
- 0.01 0.01 0.01 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 3 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- -1 0 0 0 -0 0
-
- 750
- 0 0 0 0 -0 0
-
- 392.031
- 0
- 0
- 453.125
- 0
- 63.9062
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 1 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 1 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
-
- 1 -0 0 0 -0 3.14159
-
- 750
- 0 0 0 0 -0 0
-
- 392.031
- 0
- 0
- 453.125
- 0
- 63.9062
-
-
- 0
- 0
- 0
- 1
-
- 0 0 1.25 0 -0 0
-
-
- 1 0.15 2.5
-
-
-
-
- 1 1 1 1
-
- __default__
-
- 0.7 0.7 0.7 1
- 0.01 0.01 0.01 1
- 0 0 0 1
-
-
- 0
-
- 0
- 1
-
-
- 0
- 10
- 0 0 1.25 0 -0 0
-
-
- 1 0.15 2.5
-
-
-
-
-
- 1
- 1
- 0 0 0
- 0
- 0
-
-
- 1
- 0
- 0
- 1
-
- 0
-
-
-
-
- 0
- 1e+06
-
-
- 0
- 1
- 1
-
- 0
- 0.2
- 1e+13
- 1
- 0.01
- 0
-
-
- 1
- -0.01
- 0
- 0.2
- 1e+13
- 1
-
-
-
-
-
- 1
-
-
- ground_plane::link
- door::link
- -0.5 0 0 0 -0 0
-
- 0 0 1
- true
-
- -3.14
- 3.14
-
-
- 0
- 0
- 0
- 0
-
-
-
-
-
- 0
- 0.2
-
-
- 0
- 0.2
-
-
-
-
-
-
- 6.42455 0.596341 0.5 0 -0 0
+
+ 1
-
- 1
-
- 0.166667
- 0
- 0
- 0.166667
- 0
- 0.166667
-
- 0 0 0 0 -0 0
-
-
- 1 1 1
-
+
+ 0 0 1
+ 100 100
+
- 10
+
+
+ 100
+ 50
+
+
+
-
-
-
-
-
-
-
+ 10
+ 0
-
- 1 1 1
-
+
+ 0 0 1
+ 100 100
+
+
+ 0
+ 0
+
0
- 0
0
+ 1
-
-
- -7.49102 -1.46819 0.5 0 -0 0
+
+ -9.1 0.6 0.5 0 -0 0
1
- 0.145833
+ 0.354167
0
0
- 0.145833
+ 0.104167
0
- 0.125
+ 0.416667
- 0 0 0 0 -0 0
+ 0 0 -0.2 0 -0 0
-
- 0.5
- 1
-
+
+ 1 2 0.5
+
10
-
-
-
-
-
-
+
+
+ 0.7
+ 0.7
+
+
+
+
-
-
-
-
+
+
-
- 0.5
- 1
-
+
+ 1 2 0.5
+