Fix spaces.
Fix ignores.
Merge branch 'master' of github.com:trulabs/qxmpp

Conflicts:
	tests/tests.pro