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

Conflicts:
	app/scripts/controllers/AdminUsers.js