Export
Merge remote-tracking branch 'origin/master'

Conflicts:
	projet/devoo/src/main/java/model/manager/PlanManager.java