Merge origin/master

Conflicts:
	src/java/bdd/gardeMySQL.java
	src/java/bean/Gardes.java
	src/java/servlet/GardesServlet.java
	web/WEB-INF/jspf/header.jspf

web/WEB-INF/feuilleGardes.jsp

@@ -36,10 +36,31 @@
                                 </c:forEach>
                             </tr>
                         </thead>
+                          <tbody>
+                <c:set var="oldId" value="-1" scope="page"/>
+                <tr>                
+                    <c:forEach items='${sessionScope.lesVentilInit}' var="uneVentil" varStatus="status">
+                        <c:set var="newId" value='${uneVentil.getPompier().getId()}' scope="page"/> 
+                        <c:if test='${oldId != newId}' var="test" scope="page">
+                        </tr><tr>
+                            <td>${uneVentil.getPompier().getId()}</td>
+                            <td>${uneVentil.getPompier().getNom()} ${uneVentil.getPompier().getPrenom()}</td>
+
+                            <c:set var="oldId" value='${newId}' scope="page"/>
+                        </c:if>
+                        <c:set var="activite" value='${uneVentil.getDisponibilite()}' scope="page"/>
+                        <td>
+                            <input readonly type="text" value='${activite}' name="lesActivites"class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
+                        </td>
+                    </c:forEach>
+                </tr>
+
+            </tbody>
                     </table>
                 </form>
             </fieldset> 
-
+        </section>
+    </div>