modif rapid
Merge branch 'luis'
modif page accueil
Merge branch 'master' of https://github.com/Louis-AG/Technoweb

Conflicts:
	WebArenaGroupSI4-03-AG/app/webroot/css/webarena.css
Merge branch 'louis'