CFY-529 fix example
CFY-529 added comments
CFY-529 fix comments
CFY-529 fix comment
Merge pull request #1 from cloudify-cosmo/feature/CFY-529-fix-hello-world

Feature/cfy 529 fix hello world
CFY-556 use image_name and flavor_name
Merge pull request #2 from cloudify-cosmo/feature/CFY-556-image-and-flavor-name

CFY-556 use image_name and flavor_name
CFY-542 fix typo
CFY-542 update gitignore
Merge pull request #3 from cloudify-cosmo/feature/CFY-542-fix-typo

Security group type
CFY-145 update example to not explicitly set openstack configuration already existent in the provider context
Merge pull request #5 from cloudify-cosmo/feature/CFY-145-provider-context

Simplify example
Merge remote-tracking branch 'origin/develop'

Conflicts:
	hello-world/blueprint.yaml
	hello-world/scripts/configure.sh
	hello-world/scripts/start.sh
merge to master