Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/cloudify-widget-ui

Conflicts:
	server.js