some fixes
Merge branch 'master' into add-agents-description
refactored
Merge pull request #152 from cloudify-cosmo/add-agents-description

Add agents description