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 f18b6126e..daa5338a9 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -17,29 +17,29 @@
     <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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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 479f54c1d..d0b3ebbb9 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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-017/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-017/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi2.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter2.js"></script>
+    <script type="text/javascript" src="js/gemp-018/DeckPanel.js"></script>
+    <script type="text/javascript" src="js/gemp-018/CardInformationDialog.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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 f264db5c7..4f96649fe 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
@@ -17,29 +17,29 @@
     <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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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 630ec679f..58fd6a140 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
@@ -17,29 +17,29 @@
     <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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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 9dbc71492..e6067b21c 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/index.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
@@ -26,29 +26,29 @@
     <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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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 b370c392e..88c0d3e8f 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
@@ -9,25 +9,25 @@
 <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-017/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-017/common.js"></script>
-<script type="text/javascript" src="js/gemp-017/logging.js"></script>
-<script type="text/javascript" src="js/gemp-017/chat.js"></script>
-<script type="text/javascript" src="js/gemp-017/communication.js"></script>
-<script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+<script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-018/common.js"></script>
+<script type="text/javascript" src="js/gemp-018/logging.js"></script>
+<script type="text/javascript" src="js/gemp-018/chat.js"></script>
+<script type="text/javascript" src="js/gemp-018/communication.js"></script>
+<script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-<script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-<script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-018/merchantUi.js"></script>
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 acee7644a..3483dc336 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
@@ -31,29 +31,29 @@
     <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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-018/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 c8ce21fb5..5ca25f493 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
@@ -17,29 +17,29 @@
     <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-017/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-017/common.js"></script>
-    <script type="text/javascript" src="js/gemp-017/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-017/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-017/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-017/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-018/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-018/common.js"></script>
+    <script type="text/javascript" src="js/gemp-018/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-018/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-018/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-018/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-017/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-017/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-018/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-018/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-017/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-017/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-017/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-018/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-018/merchantUi.js"></script>
 
     <script type="text/javascript">