add dijo
Merge branch 'master' of https://github.com/MYYAPPS/weblabs-widget

Conflicts:
	public/lib/bootstrap/css/bootstrap-theme.css.map
	public/lib/bootstrap/css/bootstrap-theme.min.css
	public/lib/bootstrap/css/bootstrap.css.map
	public/lib/bootstrap/css/bootstrap.min.css
	public/lib/bootstrap/js/bootstrap.min.js