Header  change
Modif Controleur
Merge pull request #32 from hanaa121/master

Controlleur
Resolution conflit
Merge pull request #30 from jllkhair/master

Controleur de Jalal
Ajax changement url
Merge pull request #33 from jllkhair/master

Ajax changement url
creation du js preference
Merge pull request #34 from shldb/master

creation du js preference
changement gerer site
recuperer code perdu
Merge pull request #35 from jllkhair/master

Last code
update de css et de js pour preference
Merge pull request #36 from shldb/master

update de css et de js pour preference
Merge remote-tracking branch 'upstream/master'