Merge branch 'master' into v2-cards

# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
#	gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson
#	gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson

gemp-lotr/docker/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 services:
 
   build:
@@ -26,18 +24,23 @@ services:
        - type: bind
          source: ../gemp-lotr-async/src/main/web
          target: /etc/gemp-lotr/web
+         consistency: consistent
        - type: bind
          source: ../../gemp-lotr
          target: /etc/gemp-lotr
+         consistency: consistent
        - type: bind
          source: ../../logs
          target: /logs
+         consistency: consistent
        - type: bind
          source: ../../replay
          target: /etc/gemp-lotr/replay
+         consistency: consistent
        - type: bind
          source: ../../logs/nohup.out
          target: /etc/gemp-lotr/nohup.out
+         consistency: consistent
     networks:
       gemp_net_1:
         ipv4_address: ${APP_IP}

gemp-lotr/docker/gemp_app.Dockerfile

@@ -15,6 +15,8 @@ RUN apk update; \
 	apk add --no-cache freetype; \
 	apk add --no-cache fontconfig; \
 	apk add --no-cache git; \
+	# Telnet etc
+	#apk add --no-cache busybox-extras; \
 	apk add --no-cache nano;