Page gestion menu et gestion page
Merge branch 'master' of github.com:chjuci/aspcorte
Resolve merge conflict