Upsell stuff
Merge remote-tracking branch 'origin/upselling'

Conflicts:
	widgets/examples/basic.html
Removing unnecessary code