bootstrap functionality was improved
Merge branch 'eliranm'

Conflicts:
	app/scripts/controllers/Widget.js
	backend/managers/WidgetManager.js
	server.js
Merge branch 'eliranm'

Conflicts:
	app/scripts/controllers/Widget.js
	backend/managers/WidgetManager.js
	server.js
remote bootstrap
remote bootstrap
Merge branch 'evgenyf-master'

Conflicts:
	backend/controllers/WidgetController.js
	backend/managers/WidgetManager.js