CFY-1372 cloudify types tosca naming convention
Merge branch 'master' into CFY-1372-tosca-naming-convention
Merge pull request #5 from cloudify-cosmo/CFY-1372-tosca-naming-convention

Cfy 1372 tosca naming convention
CFY-1230 modified inputs; added optional inputs to inputs template files; manager node now has more properties
CFY-1230 made manager server name an input as well
CFY-1230 fixed invalid json
Merge pull request #6 from cloudify-cosmo/CFY-1230-use-manager-blueprints-in-system-tests

CFY 1230 use manager blueprints in system tests
fixed inputs file for openstack manager blueprint
CFY-1512 remove requirements files
Merge pull request #8 from cloudify-cosmo/CFY-1512-remove-requirements-file

CFY-1512 remove requirements files
CFY-1567 added neutron_url input to openstack manager blueprint
CFY-1567 added ability to explicitly set nova_url; 'region' may now be taken from environment variables
Bump version to 3.1rc2
Merge branch 'master' into CFY-1569-allow-explcit-passing-of-neutron-url-in-openstack-credentials
Merge pull request #9 from cloudify-cosmo/CFY-1569-allow-explcit-passing-of-neutron-url-in-openstack-credentials

CFY 1569 allow explcit passing of neutron url in openstack credentials
Bump version to 3.1rc2
CFY-1590 added nova-net support to openstack plugin
Merge branch 'master' into CFY-1590-nova-net-support-for-3.1
expected git branch to be of the form CFY-1234-..., but it was CFY-1590-nova-net-support-for-3.1 ; exiting. moved security groups descriptions to a type property rather than a nested one
CFY-1590-nova-net-support-for-3.1 created nova net manager blueprint