Removed Prosody folder
Ejabberd config files included
Merge branch 'master' of https://github.com/juanignaciomolina/txtr-server.git

Conflicts:
	ejabberd/ejabberd.yml
	prosody/etc/prosody.cfg.lua