merging gemp improvements branch into card-dev

.gitignore

@@ -17,3 +17,4 @@ logs/*
 **/logs
 .idea/
 *.iml
+remote-sync

gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java

@@ -267,6 +267,8 @@ public class GempukkuHttpRequestHandler extends SimpleChannelInboundHandler<Full
             HttpHeaders headers = new DefaultHttpHeaders();
             headers.set(CONTENT_TYPE, "text/html; charset=UTF-8");
 
+            if (html == null)
+                html = "";
             // Build the response object.
             FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, HttpResponseStatus.OK, Unpooled.wrappedBuffer(html.getBytes(CharsetUtil.UTF_8)), headers, EmptyHttpHeaders.INSTANCE);
             sendResponse(ctx, request, response);

gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js

@@ -380,21 +380,17 @@ var Card = Class.extend({
         return false;
     },
 
-    pngErratas: {
-        "1": [3, 55, 113, 235, 318],
+    remadeErratas: {
+        "0": [7],
+        "1": [3, 12, 43, 46, 55, 113, 235, 318],
         "3": [48],
         "4": [236, 237],
         "18": [8, 12, 25, 35, 48, 50, 77, 78, 79, 80, 94, 97]
     },
 
     getErrata: function (setNo, cardNo) {
-        if (setNo == 0 && cardNo == 7)
-            return "/gemp-lotr/images/erratas/LOTR00007.jpg";
-        if (setNo == 1 && (cardNo == 12 || cardNo == 43 || cardNo == 46))
-            return "/gemp-lotr/images/erratas/LOTR010" + cardNo + ".jpg";
-
-        if (this.pngErratas["" + setNo] != null && $.inArray(cardNo, this.pngErratas["" + setNo]) != -1)
-            return "/gemp-lotr/images/erratas/LOTR" + this.formatCardNo(setNo, cardNo) + ".png";
+        if (this.remadeErratas["" + setNo] != null && $.inArray(cardNo, this.remadeErratas["" + setNo]) != -1)
+            return "/gemp-lotr/images/erratas/LOTR" + this.formatCardNo(setNo, cardNo) + ".jpg";
         return null;
     },