Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/dummyresource/facade.h b/dummyresource/facade.h
index 7a516de..310ef77 100644
--- a/dummyresource/facade.h
+++ b/dummyresource/facade.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "client/clientapi.h"
-#include "store/database.h"
+#include "common/storage.h"
 
 class ResourceAccess;
 
@@ -18,5 +18,5 @@ public:
 
 private:
     QSharedPointer<ResourceAccess> mResourceAccess;
-    QSharedPointer<Database> mDatabase;
+    QSharedPointer<Storage> mStorage;
 };