...
fixed conflicts
done
Merge pull request #97 from cloudify-cosmo/review-annas-comments

Review annas comments