Merge origin/master

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

web/WEB-INF/feuilleGardes.jsp

@@ -31,14 +31,17 @@
                             <tr>
                                 <c:forEach var="i" begin="0" end="6" step="1">
                                     <c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
+                                        <c:set var="periode" value="${unePeriode.getCode()}" scope="page"/>
                                         <td class="text-center">${unePeriode}</td>
                                     </c:forEach>
                                 </c:forEach>
                             </tr>
                         </thead>
                           <tbody>
+                              
                 <c:set var="oldId" value="-1" scope="page"/>
-                <tr>                
+                <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">
@@ -48,6 +51,7 @@
 
                             <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]}"/>