First work on decrypt
Merge branch 'master' of github.com:open-keychain/open-keychain
Merge branch 'master' of github.com:open-keychain/open-keychain
Merge pull request #844 from timbray/master

Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters)
Merge branch 'master' of github.com:open-keychain/open-keychain
Update libs
Fix build
ACCESS_NETWORK_STATE no longer needed
Pull from transifex
move LogLevel info into LogType enum
Merge remote-tracking branch 'origin/master'

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml
minor fix for passphrase test
start work on encrypt/decrypt test classes
Fix construction of algorithmID in Keybase result lists