Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp

src/java/com/test/beans/User.java

@@ -6,28 +6,30 @@
 package com.test.beans;
 
 import java.util.Objects;
+
 /**
  *
  * @author thomas.millot
  */
 public class User {
+
     private String pseudo;
     private String mdp;
-    
-    public User(String pseudo, String mdp){
+
+    public User(String pseudo, String mdp) {
         this.pseudo = pseudo;
-        this.mdp = mdp;        
+        this.mdp = mdp;
     }
-    
-    public String getPseudo(){
+
+    public String getPseudo() {
         return pseudo;
     }
-    
-    public String getMdp(){
+
+    public String getMdp() {
         return mdp;
     }
-    
-    public void setMdp(){
+
+    public void setMdp() {
         this.mdp = mdp;
     }