Merge origin/master

Conflicts:
	src/java/com/test/forms/AuthentifForm.java
	web/WEB-INF/PompierJSP.jsp

web/WEB-INF/CreaPompier.jsp

@@ -40,8 +40,10 @@
                 <input type="text" name="ztAdrVille" placeholder="Ville" /><br /><br/>
                 <label for="nGrade">Numéro de grade : </label>
                 <input type="number" name="nGrade"/><br /><br/>
-                <input type="submit" value="Valider" />
+                <input type="submit" value="="nStatut"/><br /><br/>
+                <label for="eMail">Mail :Valider" />
             </form>
         </fieldset>
+        
     </body>
 </html>