Merge branch 'f-update' into f-files

CHANGELOG.md

include/caosdb/entity.h

src/caosdb/entity.cpp

test/CMakeLists.txt

test/test_configuration.cpp

test/test_connection.cpp

test/test_entity.cpp

test/test_protobuf.cpp

test/test_transaction.cpp