Merge branch 'eliranm'

Conflicts:
	app/scripts/controllers/Widget.js