Merge origin/master

Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css

src/java/servlet/GardesServlet.java

@@ -115,7 +115,7 @@ public class GardesServlet extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 //        processRequest(request, response);
-            DispoForm vf = new DispoForm();
+        DispoForm vf = new DispoForm();
         vf.verifDispo(request);
         getServletContext().getRequestDispatcher("/WEB-INF/pompierJSP.jsp").forward(request, response);
     }