Merge branch 'master' into ceti_summer_school

.gitignore

+.idea
 cmake-build-debug
 .catkin_tools/
 .catkin_workspace

.gitlab-ci.yml

@@ -12,7 +12,7 @@ build-ws:
     - apt-get install -y ros-melodic-libfranka python-catkin-tools libeigen3-dev 
     - echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
     - source ~/.bashrc
-    - rosdep install -y --from-paths .
+    - rosdep install -y -i --from-paths .
     - catkin build
   tags:
   - highmem

.gitmodules

@@ -17,6 +17,12 @@
 	path = src/simulation_util
 	url = ../simulation_util.git
 	branch = master
+[submodule "src/gazebo-pkgs"]
+	path = src/gazebo-pkgs
+	url = https://github.com/JenniferBuehler/gazebo-pkgs.git
+[submodule "src/general-message-pkgs"]
+	path = src/general-message-pkgs
+	url = https://github.com/JenniferBuehler/general-message-pkgs.git
 [submodule "src/tutorial_ros_hello_world"]
 	path = src/tutorial_ros_hello_world
 	url = ../ceti-summer-school/tutorial_ros_hello_world.git

franka_description @ a651f4fe

-Subproject commit 4356d31a7cd02c03662f9e4b453f100c646774c6
+Subproject commit a651f4fee48571a0378362440a8bdc75b00479e3

gazebo-pkgs @ baf0f033

+Subproject commit baf0f033475c3a592efb0862079f3ff8392cadf6

general-message-pkgs @ f0c7a0cc

+Subproject commit f0c7a0cc811187cca8e928bc7c5906e463c24945

panda_simulation @ 7d6668f7

-Subproject commit cabb18c9dec6d38450090e2a322acf42115bb655
+Subproject commit 7d6668f7391901e9f1f0039c20733eec731fc68f

sample_applications @ 9b8c551b

-Subproject commit 97ac32243fcc7136e737a07eba4ac4bb55b74bb0
+Subproject commit 9b8c551bb2a05ab06226c5da415842eab543e5f1

simulation_util @ 815a2481

-Subproject commit 1bb3837a9713b4124114bc4f58b9c2ab51d11592
+Subproject commit 815a248170b589b82d736278a65d11bfd1ca2d3e