Merge origin/master

Conflicts:
	nbproject/project.properties
	src/java/bean/Pompier.java
	src/java/servlet/PompierServlet.java
	src/java/util/TrmtDate.java
	web/WEB-INF/jspf/formulairePompier.jspf
	web/WEB-INF/jspf/header.jspf
	web/WEB-INF/web.xml

web/css/mycss.css

@@ -84,3 +84,30 @@ aside, #btAfficherPompier {
 select[readonly] {
   pointer-events: none; 
 }
+.blanc {
+    background-color: white;
+    color: white; 
+    border-color : white;
+}
+
+.gris {
+    background-color: gray;
+    color: gray;
+    border-color: gray;
+}
+
+.jaune {
+    background-color: yellow;
+    color: yellow;
+    border-color: yellow;
+}
+
+.ztVentil {
+    width : 40%;
+    border: 3px solid;   
+    
+}
+
+.ztVentil:hover {
+    border-color: grey;    
+}