add registration@jabber.at to watchers
add ucf-dist files
Merge branch 'master' of git.fsinf.at:fsinf/ejabberd

Conflicts:
	ejabberd.cfg
Merge branch 'master' of github.com:mathiasertl/jabber.at