Merge branch 'dev' into f-fsm

.gitignore

.gitlab-ci.yml

CHANGELOG.md

Makefile

README_SETUP.md

conf/core/cache.ccf

conf/core/global_entity_permissions.xml

conf/core/log4j2-debug.properties

conf/core/log4j2-default.properties

conf/core/server.conf

conf/core/usersources.ini.template

src/doc/CaosDB-Query-Language.md

src/doc/Makefile

src/doc/README_SETUP.md

src/doc/administration/configuration.rst

src/doc/administration/maintenance.rst

src/doc/administration/server_side_scripting.rst

src/doc/concepts.rst

src/doc/conf.py

src/doc/development/benchmarking.md