Merge branch 'last-message-correction' of github.com:lloydwatkin/xmpp-ftw

Conflicts:
	package.json
1.3.1
Merge branch 'master' of github.com:lloydwatkin/xmpp-ftw

Conflicts:
	package.json
1.3.2