Added Preference for concealing the PgpApplication
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
Final Commit for #662
Merge remote-tracking branch 'upstream/master'

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
Hopefully fixes Travis build errors
Added description to Setting, Changed title to suggested one
Fixed unescaped apostrophe
Fixed another unescaped apostrophe.
Fixed gitmodules
Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master

Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
Merge branch 'da-kid-master'
Merge branch 'master' into yubikey