Merge pull request #13 from cloudify-cosmo/develop

Merging before 3.0b1 release
for 3.0b1 release
release
release
release fixes
for release