Merging.
Merge branch 'master' of https://github.com/Kixeye/kixmpp.git

Conflicts:
	kixmpp-server/src/main/java/com/kixeye/kixmpp/server/KixmppServer.java