Improve handling of presence conflict

Fixes issue #311
Switch to GP latest asmack
Merge branch 'conflict' of https://github.com/devrandom/Gibberbot into devrandom-conflict

Conflicts:
	src/info/guardianproject/otr/app/im/app/SimpleAlertHandler.java