stable
fix

Conflicts:
	index.html
	js/cc_ext.js