Update types.yaml

Added container type that inherits host as it might have an agent inside as well
Update types.yaml

fixed type
Merge pull request #160 from yaronp68/patch-1

Update types.yaml
Merge branch 'develop' into feature/CLOUDIFY-2423-send-started-events-from-ruote

Conflicts:
	orchestrator/src/main/resources/cloudify/types/types.yaml