Attempt to put sketches inside callouts (commented out for now).
Merge branch 'master-2'

Conflicts resolved:
	test/spec/widget-carousel-spec.js
	test/spec/widget-lineGraph-spec.js