clenup
Merge branch 'history_fx' into history

Conflicts:
	src/misc/db/encrypteddb.cpp
	src/misc/db/encrypteddb.h