CLOUDIFY-2103 fixed phase4 dsl with dsl changes
CLOUDIFY-2107 change type/template workflows to be inline.
CLOUDIFY-2083 continue work on feature. commit in order to merge changes from develop
Merge branch 'develop' into feature/CLOUDIFY-2083-relationship-interface

Conflicts:
	orchestrator/src/main/java/org/cloudifysource/cosmo/dsl/PluginArtifactAwareDSLPostProcessor.java
	orchestrator/src/main/resources/cloudify/tosca/types/types.yaml
CLOUDIFY-2083 fix broken tests
update versions.py of riemann plugin to develop
CLOUDIFY-2114

Add sending-task event
Merge pull request #71 from CloudifySource/feature/CLOUDIFY-2114-sent-task-event

CLOUDIFY-2114
CLOUDIFY-2083 add test and fix some bugs
CLOUDIFY-2083 fix broken unit tests
Merge branch 'develop' into feature/CLOUDIFY-2083-relationship-interface
CLOUDIFY-2116

Add test for validation of a dsl containing agent plugin without host relationship
CLOUDIFY-2083 add basic dsl unit tests for relationship interfaces and relationship templates
Merge pull request #72 from CloudifySource/feature/CLOUDIFY-2083-relationship-interface

Integrate basic support for defining an inteface on a relationship
CLOUDIFY-2116

Add validation to dsl that a node with agent plugin has a relationship contained_in a host node
CLOUDIFY-2116

Improve validation message
Merge pull request #74 from CloudifySource/feature/CLOUDIFY-2116-validate-node-with-agent-plugin-relate-to-host

Feature/cloudify 2116 validate node with agent plugin relate to host
CLOUDIFY-2107 added workflow mappings and refs for workflows and policies.
CLOUDIFY-2083 renaming relationship template attribute names
Merge branch 'develop' into feature/CLOUDIFY-2107-workflow-mappings

Conflicts:
	orchestrator/src/main/java/org/cloudifysource/cosmo/dsl/DSLProcessor.java
	orchestrator/src/main/java/org/cloudifysource/cosmo/dsl/PluginArtifactAwareDSLPostProcessor.java
	orchestrator/src/main/resources/scripts/ruby/participants/prepare_plan_participant.rb
	orchestrator/src/test/java/org/cloudifysource/cosmo/dsl/AbstractDSLProcessorTest.java
	orchestrator/src/test/java/org/cloudifysource/cosmo/manager/ValidatorTest.java