Started to merge develop with master

.gitmodules

@@ -0,0 +1,28 @@
+[submodule "uwsim_resources/underwater_simulation"]
+	path = uwsim_resources/underwater_simulation
+	url = https://github.com/disaster-robotics-proalertas/underwater_simulation.git
+	branch = usv_sim
+[submodule "uwsim_resources/uwsim_osgbullet"]
+	path = uwsim_resources/uwsim_osgbullet
+	url = https://github.com/disaster-robotics-proalertas/uwsim_osgbullet.git
+	branch = usv_sim
+[submodule "uwsim_resources/uwsim_bullet"]
+	path = uwsim_resources/uwsim_bullet
+	url = https://github.com/disaster-robotics-proalertas/uwsim_bullet.git
+	branch = usv_sim
+[submodule "uwsim_resources/visualization_osg"]
+	path = uwsim_resources/visualization_osg
+	url = https://github.com/disaster-robotics-proalertas/visualization_osg.git
+	branch = usv_sim
+[submodule "uwsim_resources/uwsim_osgworks"]
+	path = uwsim_resources/uwsim_osgworks
+	url = https://github.com/disaster-robotics-proalertas/uwsim_osgworks.git
+	branch = usv_sim
+[submodule "uwsim_resources/uwsim_osgocean"]
+	path = uwsim_resources/uwsim_osgocean
+	url = https://github.com/disaster-robotics-proalertas/uwsim_osgocean.git
+	branch = usv_sim
+[submodule "freefloating_gazebo_resources/freefloating_gazebo"]
+	path = freefloating_gazebo_resources/freefloating_gazebo
+	url = https://github.com/disaster-robotics-proalertas/freefloating_gazebo.git
+	branch = usv_sim

.travis.yml

@@ -0,0 +1,33 @@
+sudo: required
+dist: trusty
+language: generic
+compiler:
+  - gcc
+cache:
+  directories:
+    - $HOME/.ccache  # can be any valid cache location
+env:
+  global:
+    - LIBGL_ALWAYS_SOFTWARE=1
+    - VERBOSE_OUTPUT='false'
+    - CATKIN_CONFIG='--no-install'
+    - CATKIN_PARALLEL_JOBS='-p1'
+    - ROS_PARALLEL_JOBS='-j1'
+    - CCACHE_DIR=$HOME/.ccache
+matrix:
+  include:
+#    - env: USE_DEB=true ROS_DISTRO=indigo AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' ROSDEP_SKIP_KEYS="gazebo gazebo_msgs gazebo_plugins gazebo_ros gazebo_ros_control gazebo_ros_pkgs"
+    - env: USE_DEB=true ROS_DISTRO=kinetic PRERELEASE=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh'
+#    - env: USE_DEB=true ROS_DISTRO=kinetic PRERELEASE=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh && sh .uuv_ci_config/install_gazebo9.sh' ROSDEP_SKIP_KEYS="gazebo gazebo_msgs gazebo_plugins gazebo_ros gazebo_ros_control gazebo_ros_pkgs"
+#    - env: USE_DEB=true ROS_DISTRO=lunar AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh'
+#    - env: USE_DEB=true ROS_DISTRO=melodic AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh'
+#  allow_failures:
+#    - env: USE_DEB=true ROS_DISTRO=indigo AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' ROSDEP_SKIP_KEYS="gazebo gazebo_msgs gazebo_plugins gazebo_ros gazebo_ros_control gazebo_ros_pkgs"
+#    - env: USE_DEB=true ROS_DISTRO=lunar AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh'
+#    - env: USE_DEB=true ROS_DISTRO=melodic AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh'
+install:
+  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+script:
+  - source .ci_config/travis.sh
+
+

.usv_sim_ci_config/ros_kinetic.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copyright (c) 2016 The UUV Simulator Authors.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sh .uuv_ci_config/uuv_dependencies.sh
+

.usv_sim_ci_config/uuv_dependencies.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# Copyright (c) 2016 The UUV Simulator Authors.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# DEP PACKAGES
+apt -qq install --no-install-recommends --allow-unauthenticated -y \
+  build-essential python-catkin-tools python-pip dvi2ps dvipng binutils \
+  mesa-utils module-init-tools x-window-system ros-$ROS_DISTRO-python-orocos-kdl
+