diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
index 9546f0745..973f18a48 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
@@ -23,31 +23,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
index b9d277a75..94f783d9e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -17,31 +17,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
index ffe4b0cef..7b1bb9c9c 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
@@ -58,8 +58,8 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
 
     <script type="text/javascript" src="/generic-tcg/js/CardContainer.js"></script>
     <script type="text/javascript" src="/generic-tcg/js/CardGroup.js"></script>
@@ -67,15 +67,15 @@
     <script type="text/javascript" src="/generic-tcg/js/AttachedCardsLayoutCardGroup.js"></script>
     <script type="text/javascript" src="/generic-tcg/js/jquery/jquery-sizes.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-021/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-021/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi2.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter2.js"></script>
+    <script type="text/javascript" src="js/gemp-022/DeckPanel.js"></script>
+    <script type="text/javascript" src="js/gemp-022/CardInformationDialog.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi2.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/game.html b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
index ad9c9d582..f84eb769c 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
@@ -17,31 +17,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
 
 <script type="text/javascript">
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
index 0e6de7216..dafcf642b 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
@@ -17,31 +17,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
 <script type="text/javascript">
     var chat;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/index.html b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
index 45da2300e..4604b9a6e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/index.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
@@ -26,31 +26,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
     <script type="text/javascript">
         jQuery.fn.center = function () {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
index 3120d8d88..9e851b10b 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
@@ -9,28 +9,28 @@
 <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
 <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-021/common.js"></script>
-<script type="text/javascript" src="js/gemp-021/logging.js"></script>
-<script type="text/javascript" src="js/gemp-021/chat.js"></script>
-<script type="text/javascript" src="js/gemp-021/communication.js"></script>
-<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+<script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-022/common.js"></script>
+<script type="text/javascript" src="js/gemp-022/logging.js"></script>
+<script type="text/javascript" src="js/gemp-022/chat.js"></script>
+<script type="text/javascript" src="js/gemp-022/communication.js"></script>
+<script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-021/set20.js"></script>
-<script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-<script type="text/javascript" src="js/gemp-021/set40.js"></script>
-<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-022/set20.js"></script>
+<script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+<script type="text/javascript" src="js/gemp-022/set40.js"></script>
+<script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/CardInformationDialog.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/CardInformationDialog.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/CardInformationDialog.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/CardInformationDialog.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/DeckPanel.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/DeckPanel.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/DeckPanel.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/DeckPanel.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/chat.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/chat.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/chat.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/common.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/common.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/common.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/commonUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/commonUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/communication.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/communication.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/communication.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deliveryService.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameAnimations.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameAnimations.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameHistoryUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hobbit.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hobbit.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hobbit.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hobbit.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/inheritance.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/inheritance.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCardGroup.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCardGroup.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCards.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/leagueResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/logging.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/logging.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/logging.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/merchantUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/playerStatsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/playerStatsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/playerStatsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/playerStatsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set20.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set20.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set20.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set40.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set40.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set40.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set40.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/soloDraftUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/soloDraftUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/soloDraftUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/soloDraftUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/statsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/statsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/statsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/statsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/tournamentResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/tournamentResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/tournamentResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
index 0a9330590..7eb5782f7 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
@@ -31,31 +31,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
index cceb5c257..2ef0b0361 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
@@ -17,31 +17,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
index d541fc971..130afe5c9 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
@@ -17,32 +17,32 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-021/common.js"></script>
-    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-022/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-022/common.js"></script>
+    <script type="text/javascript" src="js/gemp-022/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-022/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-022/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-022/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-021/set40.js"></script>
-    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-022/set40.js"></script>
+    <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
-    <script type="text/javascript" src="js/gemp-021/soloDraftUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-022/soloDraftUi.js"></script>
 
     <script type="text/javascript">