Merge pull request #1 from siacs/development

pull
Merge pull request #2 from siacs/development

2
Improve OTR fingerprint dialog and fix german sentence
Merge pull request #89 from dschuermann/fix-otr-message

Improve OTR fingerprint dialog and fix german sentence