before pull
workbench pourri avant merge
workbench pourri avant merge
Merge branch 'master' of https://github.com/aminaud/Cloud

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	mini-projet cloud/src/emn/llqmam/cloud/application/Application.java
	mini-projet cloud/src/emn/llqmam/cloud/data/Vm.java
	mini-projet cloud/src/emn/llqmam/cloud/views/components/ApplicationFrame.java