Merge pull request #17 from cloudify-cosmo/master

CFY-1755-start-phase