Partition des JSP
Merge origin/master