GS-11498
GS-11498
GS-11499
GS-11499
GS-11499
Added cosmo server & port to private configuration
GS-11499
GS-11499
GS-11499
GS-11499
adding restler
adding ng-file-upload
adding proxy to livereload and fixing the json path.
GS-11499
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/CloudifySource/cosmo-ui

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/PlansIndex.js
	app/scripts/controllers/main.js
	app/scripts/controllers/plans.js
	app/scripts/directives/cosmoLayout.js
	app/scripts/services/YamlGraphParser.js
	app/scripts/services/yamlService.js
	app/styles/main.scss
	app/views/plansIndex.html
	server.js
Merge branch 'master' of https://github.com/CloudifySource/cosmo-ui

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/PlansIndex.js
	app/scripts/controllers/main.js
	app/scripts/controllers/plans.js
	app/scripts/directives/cosmoLayout.js
	app/scripts/services/YamlGraphParser.js
	app/scripts/services/yamlService.js
	app/styles/main.scss
	app/views/plansIndex.html
	server.js
Merge branch 'master' of https://github.com/erezgiga/cosmo-ui

Conflicts:
	server.js
adding temporary bridge between rest data and graph required data
fixing blueprint chart.