CFY-1196 move config files
CFY-1196 fix dev command
Merge pull request #70 from cloudify-cosmo/CFY-1196-cli-refactor

CFY-1196 move config files
CFY-971 added version to tests blueprints
CFY-971 modified dev-requirements for tests
CFY-971 reverted dev-requirements
Merge pull request #71 from cloudify-cosmo/CFY-971-Add-version-field-to-DSL

CFY 971 Add version field to DSL
Merge branch 'master' into CFY-1231-new-bootstrap

Conflicts:
	cloudify_cli/commands/dev.py
	cloudify_simple_provider/cloudify-config.defaults.yaml
	cloudify_simple_provider/cloudify-config.yaml