update to latest asmack

fixes #2096
clean up of ChatView - get OTR instances directly, no local variables
also don't reset remoteAddress form incoming message
just use what the chat is bound too
make sure cursorchats is not null
combine two methods that are only used together
clean up of handling otrswitch state
fix local link setup, and mark messages as INCOMING
strips resource from outgoing addressing (makes OTR work again!)
Properly reorg fragment saved state on dataset change

fixes #2118
Merge pull request #316 from devrandom/fixes3

Bug - properly reorg fragment saved state on dataset change
we really don't need the toast messages here
this is especially annoying for LLXmpp since you add contacts all the time
make sure we don't get stuck with a hung logout
Merge pull request #315 from n8fr8/bug_bonjour_broke

Bug bonjour broke
small lockscreen cleanup
don't use custom cipher suites on older devices (may not support them)
make sure hte account list background is the right color
bug fix for some devices (mainly 2.3.x)
one last quick tune of lockscreen strings
Merge pull request #317 from n8fr8/bug_gingerbread_fixes

Bug gingerbread fixes
update version
hotfix for missing emoji. fixes #2132.
was trying to load missing emoji set, and caused all emoji loading to fail.
https://dev.guardianproject.info/issues/2132
Merge branch 'upstream' into swipe