Merge branch 'master' of github.com:cloudify-cosmo/getcloudify.org into chef
Merge remote-tracking branch 'gigaspaces/master' into chef
Chef plugin doc - add sections that briefly describes all properties
fix conflict
Merge branch 'Fewbytes-chef'