Controller a des instances de plan manager et livraison manager
Merge branch 'master' of https://github.com/H4305/DevOO.git
controller
Merge branch 'master' of https://github.com/H4305/DevOO

Conflicts:
	projet/devoo/.classpath
	projet/devoo/.classpath.orig
	projet/devoo/pom.xml