Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

version bump and changelog

Merge branch 'development'

only end otr session if there is more than one contact presence. reset otherwise

cleanup for clear conversation history. small otr fixes

replace the exif interface with a small static class from 3d gallery

proper error state for images

fixed 'share image' context menu

fixed intent managment

Merge pull request #593 from weiss/improve-german-translations

Improve some of the German translations

Improve some of the German translations

end otr session if plain text message from another instance is being received

Tweak README some more

Fix typo in subtree merge directions

Add subtree merge directions to README

Subtree merged in openpgp api lib

improvements on findConversation

always show verify fingerprint if there is an active otr session

Subtree merged in minidns

Remove minidns dir