Pour Bernardo
Merge remote-tracking branch 'origin/master'

Conflicts:
	projet/devoo/src/test/java/devoo/PlanManagerTest.java