ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
Merge remote-tracking branch 'origin/develop' into develop-vuminhkh
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
Bug correction
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
Bug correction
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
Minor bug correction
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
Minor bug correction -- Good formatting rule for java files
Merge remote-tracking branch 'origin/develop' into develop-vuminhkh

Conflicts:
	.gitignore
	alien4cloud-rest-it/src/test/java/alien4cloud/it/utils/websocket/StompClientHandler.java
	alien4cloud-rest-it/src/test/java/alien4cloud/it/utils/websocket/WebSocketClientHandler.java
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
Merge issue correction
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
Test correction
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
Bug correction
ALIEN-462 : As a PaaS Provider developper I want to receive notifications when the list of compute template for a given cloud changes.
ALIEN-458 : As a USER I want the cloud resource matching to be persisted in the deployment setup.
ALIEN-459 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
ALIEN-460 : As a USER I want the cloud deployment properties to be persisted within the deployment setup
Bug correction
Ignore intellij files
Merge remote-tracking branch 'vuminhkh/develop' into develop

Conflicts:
	.gitignore
	alien4cloud-rest-api/src/main/java/alien4cloud/rest/application/ApplicationDeploymentController.java
Merge remote-tracking branch 'origin/develop' into develop