Migration to ejabberd
Merge branch 'master' of https://github.com/juanignaciomolina/txtr-server.git

Conflicts:
	prosody/etc/prosody.cfg.lua