train fixes
Merge branch 'master' of github.com:linuxwolf/xmpp-fed

Conflicts:
	draft-saintandre-xmpp-dna.xml