Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/gui/group_html.cpp

@@ -4657,7 +4657,6 @@ namespace NLGUI
 				if(!CFile::fileExists(normal))
 				{
 					normal = "web_del.tga";
-					addImageDownload(normalBitmap, ctrlButton, style);
 				}
 				else
 				{
@@ -4674,6 +4673,8 @@ namespace NLGUI
 						normal = "web_del.tga";
 					}
 				}
+
+				addImageDownload(normalBitmap, ctrlButton, style);
 			}
 		}
 
@@ -4698,12 +4699,9 @@ namespace NLGUI
 			if (overBitmap != normalBitmap)
 			{
 				over = localImageName(overBitmap);
-				if (!CFile::fileExists(over))
-				{
 				addImageDownload(overBitmap, ctrlButton, style, TImageType::OverImage);
 			}
 		}
-		}
 
 		ctrlButton->setType (type);
 		if (!normal.empty())

code/nel/src/gui/http_hsts.cpp

@@ -55,7 +55,7 @@ namespace NLGUI {
 			time_t currentTime;
 			time(&currentTime);
 
-			return (hsts.Expires < currentTime);
+			return (hsts.Expires > currentTime);
 		}
 
 		return false;