Merge branch 'develop'

Conflicts:
	CMakeLists.txt
	cmake/CLangFormat.cmake
	snapcraft.yaml
	src/CMakeLists.txt
	src/core/Database.cpp
	src/core/Database.h
	src/core/Tools.cpp
	src/crypto/CryptoHash.h
	src/crypto/ssh/ASN1Key.h
	src/crypto/ssh/OpenSSHKey.cpp
	src/format/Kdbx4Reader.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseTabWidget.h
	src/gui/DatabaseWidget.cpp
	src/gui/DatabaseWidget.h
	src/gui/DetailsWidget.cpp
	src/gui/DetailsWidget.ui
	src/gui/EditWidgetProperties.cpp
	src/gui/EntryPreviewWidget.cpp
	src/gui/EntryPreviewWidget.ui
	src/gui/FileDialog.cpp
	src/gui/dbsettings/DatabaseSettingsDialog.cpp
	src/gui/dbsettings/DatabaseSettingsDialog.h
	src/gui/group/EditGroupWidget.cpp
	src/gui/group/EditGroupWidget.h
	src/sshagent/ASN1Key.h
	src/sshagent/OpenSSHKey.cpp
	src/sshagent/SSHAgent.cpp
	tests/CMakeLists.txt

ci/trusty/Dockerfile

@@ -39,6 +39,7 @@ RUN set -x \
         clang-3.6 \
         libclang-common-3.6-dev \
         clang-format-3.6 \
+        llvm-3.6 \
         cmake3 \
         make \
         libgcrypt20-18-dev \
@@ -49,12 +50,15 @@ RUN set -x \
         ${QT5_VERSION}tools \
         ${QT5_VERSION}x11extras \
         ${QT5_VERSION}translations \
+        ${QT5_VERSION}svg \
         zlib1g-dev \
         libyubikey-dev \
         libykpers-1-dev \
         libquazip-dev \
         libxi-dev \
         libxtst-dev \
+        libqrencode-dev \
+        xclip \
         xvfb
 
 ENV PATH="/opt/${QT5_VERSION}/bin:${PATH}"