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
Add asmack and guava source attachments properties files

You have to build/download source as appropriate for this to work.
Better compatibility with OTR key import/export tools
Merge branch 'otr1' of https://github.com/devrandom/Gibberbot into devrandom-otr1
initial work on multiuserchat support
updating cacheword version
initial work on multiuserchat support
moved groupchat menu option to menu only
added new text entry dialogs for group chat start
fixed issue with joining group chats and related NPEs
Merge branch 'feature-muc' of github.com:n8fr8/Gibberbot into feature-muc

Conflicts:
	res/menu/chat_list_menu.xml
	src/info/guardianproject/otr/app/im/app/ChatListActivity.java
	src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
	src/info/guardianproject/otr/app/im/service/ChatSessionManagerAdapter.java
new strings for group chat dialog
Cleanup and small fixes for GroupChat/MUC support