Merge branch 'dev' into f-doc-info-resource

.gitignore

.gitlab-ci.yml

CHANGELOG.md

caosdb-webui

conf/core/cache.ccf

conf/core/log4j2-default.properties

conf/core/server.conf

doc/devel/Benchmarking.md

makefile

misc/bend_symlinks/README.md

misc/bend_symlinks/bend_symlinks.sh

misc/bend_symlinks/src/main.sh

misc/bend_symlinks/src/utils.sh

misc/bend_symlinks/test/test_suite.sh

misc/check_symlinks/check_symlinks

misc/move_files/README.md

misc/move_files/move_files.py

misc/move_files/test_move_files.py

pom.xml

scripting/bin/xls_from_csv.py