Merge branch 'master' of https://github.com/CloudifySource/cloudify-widget

Conflicts:
	public/cloudify/js/widget.js