modifications pages xhtml et classes java
Merge origin/develop into develop