CLOUDIFY-2381 Add type_implementations and replace merge its content with the node it refers to
CLOUDIFY-2381 fix pep8 errors
Merge pull request #16 from CloudifySource/feature/CLOUDIFY-2381-type-implementation

Add type implementations
CLOUDIFY-2412 Add relatonship_implementations and replace merge its content with the node relationship it refers to
Merge branch 'develop' into feature/CLOUDIFY-2412-relationship-implementations

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