Update CHANGELOG.md
Merge branch 'master' of github.com:node-xmpp/node-xmpp

Conflicts:
	CHANGELOG.md