cco

Conflicts:
	widgets/min/w_1/index.html
	widgets/min/w_5/index.html
scdac
cmerge

Conflicts:
	js/widgets.js