Merge branch 'dev' into f-generic-analysis

.gitlab-ci.yml

@@ -46,7 +46,7 @@ test:
   image: $CI_REGISTRY_IMAGE_BASE
   script:
       - if [[ "$CAOSDB_TAG" == "" ]]; then
-            CAOSDB_TAG=dev-latest;
+            CAOSDB_TAG=dev;
         fi
       - echo $CAOSDB_TAG
       - time docker load < /image-cache/caosdb-advanced-testenv.tar || true