Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java

web/WEB-INF/AuthentificationJSP.jsp

@@ -26,6 +26,6 @@
                     <p>${message}</p>
                 </fieldset>
     </form>
-    <br /><br/>
+    <br/><br/>
 </div>
 </html>

web/WEB-INF/ProfilJSP.jsp

@@ -1,5 +1,6 @@
 <%@include file="jspf/enteteJSPF.jspf" %>
 <br /><br />
+   <form name="frmModifProfil" method="POST" action="ModifProfilJSP.jsp">
 <table style='border: 0px solid white;'>
     <tr>
         <td style='border :0px;'>
@@ -24,6 +25,8 @@
                     <tr><th>Mail employeur : <input readonly type="text" name="ztMailEmp"  size="20" maxlength="30"></th></tr>
                 </table>
             </fieldset>
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Modif'" value="Modification du profil">
         </td>
     </tr>
 </table>
+ </form>