Merge branch 'dev' into f-doc-troubleshooting

.gitignore

.gitlab-ci.yml

.gitlab/merge_request_templates/Default.md

CHANGELOG.md

DEPENDENCIES.md

Makefile

README.md

README_SETUP.md

caosdb-webui

conf/core/jobs.csv

conf/core/server.conf

lib/easy-units-0.0.1-jar-with-dependencies.jar

lib/easy-units-0.0.1-javadoc.jar

lib/easy-units-0.0.1-sources.jar

misc/move_files/move_files.py

pom.xml

src/doc/CaosDB-Query-Language.md

src/doc/Data-Model.md

src/doc/Glossary.md

src/doc/Makefile