Formatting
Merge branch 'master' of github.com:jcbrand/converse.js

Conflicts:
	CONTRIBUTING.rst