Conflicts:
	converse.css

I didn't merge converse.css or converse.min.css, instead fell back to master versions.