XEP-60 is XEP-0060. And remove "www."
Merge branch 'master' of https://github.com/buddycloud/buddycloud-xep

Conflicts:
	sections/50.node-config.xml
	sections/80.affiliations.xml