coucou
Merge branch 'master' of https://github.com/moimat/WebArenaGroupSI4-10-DE

Conflicts:
	app/View/Layouts/default.ctp