Bump version to 3.1rc1
CFY-1372 cloudify types tosca naming convention
Bump version to 3.1rc1
Merge branch 'master' into CFY-1372-tosca-naming-convention

Conflicts:
	cosmo_tester/resources/blueprints/nodecellar_ec2/blueprint_ec2.yaml
CFY-1372 fixed test
Merge pull request #55 from cloudify-cosmo/CFY-1372-tosca-naming-convention

Cfy 1372 tosca naming convention
fix neutron galore test
Merge branch 'master' of github.com:cloudify-cosmo/cloudify-system-tests
CFY-1230 added support for manager blueprints in system tests