CFY-971 added version field to DSL
Merge branch 'master' into CFY-971-Add-version-field-to-DSL
CFY-971 fixed tests
CFY-971 fixed test
Merge pull request #24 from cloudify-cosmo/CFY-971-Add-version-field-to-DSL

CFY 971 Add version field to DSL
Merge branch 'master' into CFY-1185-remove-plugin-inheritance

Conflicts:
	dsl_parser/parser.py
	dsl_parser/tests/test_parser_api.py