Update to current master

This PR merges the current master from keepassx/keepassx. It uses SymmetricCipherGcrypt directly in Protocol.cpp to make it work with the latest master revision.