Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java

web/WEB-INF/ModifProfilJSP.jsp

@@ -33,5 +33,4 @@
                 </table>
             </fieldset>
              <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">           
-             
 </html>

web/css/newcss.css

@@ -9,7 +9,7 @@ and open the template in the editor.
 */
 body
 {
-    background-color: #e2e7e9;
+    background-color: #596b6e;
     background-repeat: repeat-x;
     margin:0% 0%;
     padding : 0.9em;