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

Conflicts:
	app/views/widget/_widgetForm.html