Merge branch 'dev/preparation_mangalia' of github.com:uuvsimulator/uuv_simulator into dev/preparation_mangalia