afficher les parties terminées
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/dist/all.js
	app/dist/all.min.js