initial smp support
added snackbar to indicate smp. more error handling in verify activity
small bug fix
initial smp support
added snackbar to indicate smp. more error handling in verify activity
small bug fix
use auto register for verify otr listeners
Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification

Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
check if account is online before doing smp
more npe checks in muc packet parser
made presences synchronized
Add SCRAM-SHA1 support

Factor out GS2 tokanization into own class
Add authentication exception class

Fixes #71
Spelling fix in German translation
Spelling fixes in Italian translation
Make licenses info untranslatable
Merge pull request #667 from SamWhited/licensesuntranslatable

Make licenses info untranslatable
Merge pull request #666 from SamWhited/localefixes

Spelling fixes
Improve auth error handling and state machine
basic arbitrary file transfer
bug fixes and various improvements for file transfer