Merge branch 'master' of https://github.com/keepassx/keepassx

Use SymmetricCipherGcrypt directly in Protocol.cpp to make it work with the latest master
revision.
Merge branch 'master' of https://github.com/jdachtera/keepassx