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

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/main.js
	app/scripts/controllers/navigation.js
	app/styles/main.scss
	app/views/step-1.html