moved some sections, added explanatory text
Merge branch 'master' of https://github.com/stpeter/sip-xmpp

Conflicts:
	draft-saintandre-sip-xmpp-groupchat.xml