WIP: consolidation

include/caosdb/entity.h

include/caosdb/transaction.h

src/caosdb/entity.cpp

src/caosdb/file_transmission/UploadRequestHandler.cpp

src/caosdb/transaction.cpp

src/caosdb/transaction_handler.cpp

test/test_entity.cpp

test/test_transaction.cpp