Conflicts:
	AUTHORS
	doc/compress.html
	doc/manual.html
	index.html
	lib/codemirror.js
	package.json