Conflicts:
	CHANGES.rst
	Makefile
	bower.json
	converse.min.css
	converse.min.js
	docs/doctrees/index.doctree
	docs/html/searchindex.js
	docs/source/conf.py
	index.html
	package.json