Testclient
Merge branch 'master' of github.com:astralaster/xmpp

Conflicts:
	.gitignore