Merge branch 'f-server-323' into 'dev'

CHANGELOG.md

conf/core/server.conf

...main/java/org/caosdb/server/jobs/core/EntityStateJob.java

src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java

src/main/java/org/caosdb/server/query/Query.java

src/test/java/org/caosdb/server/query/TestCQL.java