fixing bug
vm experiment results
Merge branch 'master' of https://github.com/choreos/choreos_middleware

Conflicts:
	DeploymentManager/src/main/java/org/ow2/choreos/deployment/services/datamodel/Service.java