Manual merging

.gitlab-ci.yml

package.json

public/configs/deploy/config.json

public/configs/deploy/robots/uib_drone.json

public/configs/ntnu/config.json

public/configs/ntnu/robots/x3.json

public/meshes/x3/Pioneer.gltf

src/features/robots/RobotMissionPlan.tsx

src/features/viewport/MeshLoader.tsx

src/features/viewport/Viewport.tsx

src/features/viewport/Water.tsx

yarn.lock