Changes from last wakanda build
Merge branch 'master' of https://github.com/rmello4d/BasicContainer

Conflicts:
	widget.js
adding again the widget.js