add calyx institute jabber server
remove ununused group list
improve performance of list rendering
improve thumbnail layout
make add contact text label more clear
remove group list (for now)
add Calyx Onion server
improve contact loading and display performance
fix DB upgrade bug for new field
fix issues with non loading of presence and dup contacts
allow window to update OTR state after 2 secs
ensure listman doesn't crash if updates come in too early
fixes for OTR session req/resp handling; make sure mConn is not null
fix Bug 2956 Access GUI in AsyncTask

fix Bug 2956 Access GUI in doInBackground in AsyncTask method. solved by
publishProgress and onProgressUpdate
Jabber intent

Adding jabber as a host for the intent filters
Merge pull request #435 from dim-0/master

Jabber intent
Merge pull request #427 from yzn002/master

fix Bug 2956 Access GUI in AsyncTask
Merge branch 'dev_dup_fixes' of https://github.com/n8fr8/Gibberbot into n8fr8-dev_dup_fixes

Conflicts:
	res/values/strings.xml
	src/info/guardianproject/otr/app/im/provider/ImpsProvider.java
merge fixes
small fixes for XMPP merge and applied patch
https://dev.guardianproject.info/issues/3038#change-7453