mon commit
Ajout du path.resolve
Merge branch 'marc' into Sami

Conflicts:
	app/Controller/IndexController.js