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

Conflicts:
	app/scripts/controllers/Widget.js
	backend/managers/WidgetManager.js
	package.json