comimt

Conflicts:
	js/widgets.js
ccc

Conflicts:
	js/widgets.js
	widgets/max/w_1/index.html