A quick intro.
Merge branch 'master' of https://github.com/buddycloud/buddycloud-xep

Conflicts:
	.gitignore
	sections/1.introduction.xml