Remove spurious submodule entry
XEP-0198 fixes from Ge0rg

Set up connection listener and stream handler early with patched version of smack.
Prevent binding of null resource
Fixes #1475
Fixes #1181
XEP-0198: use new smack, fixes for race condition

Reconnection callback was triggered before SM was resumed.
Fixes #1475
XEP-0198: another race condition

Fixes #1475
XEP-0198: another race condition

Delay stream enablement until resource is bound for sure
Fix duplicate ServiceDiscoveryManager
Fixes #1475
Fix case where connection appears up but is down

Smack gets confused about connection state.  Detect with pings.
Fixes #1544
Fixes #1476
Do not auto-renegotiate OTR if not currently encrypting

Fixes an issue where doing a Finish re-negotiates if remote thinks we are not encrypting.

fixes #1545
Use actual remote fingerprint rather than cached one

fixes #1546
Merge branch 'otr' of https://github.com/devrandom/Gibberbot into devrandom-otr

Conflicts:
	.gitmodules
	src/info/guardianproject/otr/OtrAndroidKeyManagerImpl.java
Merge branch 'xep0198c' of https://github.com/devrandom/Gibberbot into devrandom-xep0198c

Conflicts:
	src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
some conflict fixes resolved (removed createAccount for now)
Revert "Use actual remote fingerprint rather than cached one"

This reverts commit 009ac284c820ba0611502844e217fd165e87ed7e.

There was actually no issue to be fixed.
Minor fix to update-ant-build.sh
Sync guava version with cacheword
Put back OTR lock to presence

fixes #244
make gitmodules path public urls now
Centralized debug constant
Reset account statii on service start

fixes #1561
ImApp created in wrong place, causing NPE
Use full JID when storing public keys and fingerprints

Use full JID - with resource.

fixes #247

Also:
* Clear connection status earlier in Service lifecycle
* Keep multiple OTR session states, one per peer presence