Merge branch 'develop' of https://github.com/CloudifySource/cloudify-widget-ui into new-tests-for-DbManager

Conflicts:
	test-backend/unit/testCloudifyCliService.js