Refactored available presence handler
Refactored parsing caps
Merge branch 'master' into xep-0223

Conflicts:
	src/xmpp/stanza.h