resize example
Merge branch 'resize'

Conflicts:
	less/colorpicker.less