reviewed
Merge branch 'master' into review-terminology
Merge pull request #102 from cloudify-cosmo/review-terminology

reviewed