Fix some errors.
Merge branch 'master' of https://github.com/tatiotir/QJabberd

Conflicts:
	ConnectionManager.cpp