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 f1d4c602f..2c6595093 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -17,28 +17,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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-016/merchantUi.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">
 
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 6c9d0beea..cca9816a2 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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.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="/generic-tcg/js/CardContainer.js"></script>
     <script type="text/javascript" src="/generic-tcg/js/CardGroup.js"></script>
@@ -67,14 +67,14 @@
     <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-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-016/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-016/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi2.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/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">
 
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 a5c1d6fac..b971b8f1d 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
@@ -17,28 +17,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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-016/merchantUi.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">
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 47b15d704..dc1c0e576 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
@@ -17,28 +17,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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-016/merchantUi.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">
     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 de34bcb6b..9574c9028 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/index.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
@@ -26,28 +26,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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-016/merchantUi.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">
         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 6895e5f82..b370c392e 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-016/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-016/common.js"></script>
-<script type="text/javascript" src="js/gemp-016/logging.js"></script>
-<script type="text/javascript" src="js/gemp-016/chat.js"></script>
-<script type="text/javascript" src="js/gemp-016/communication.js"></script>
-<script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-016/merchantUi.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>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/CardInformationDialog.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/CardInformationDialog.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/CardInformationDialog.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/CardInformationDialog.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/DeckPanel.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/DeckPanel.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/DeckPanel.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/DeckPanel.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/cardFilter2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/cardFilter2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/chat.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/chat.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/chat.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/common.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/common.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/common.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/commonUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/commonUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/communication.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/communication.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/communication.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/deckBuildingUi2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/deckBuildingUi2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deliveryService.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameAnimations.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameAnimations.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameHistoryUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/hallUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/hallUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/hallUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/inheritance.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/inheritance.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCardGroup.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCardGroup.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/jCards.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/leagueResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/logging.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/logging.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/logging.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/merchantUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/merchantUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/playerStatsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/playerStatsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/playerStatsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/playerStatsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/statsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/statsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/statsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/statsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/tournamentResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/tournamentResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-017/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 8221d0efc..d81018a99 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
@@ -31,28 +31,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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-016/merchantUi.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">
         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 101ea6c50..c16cc8d88 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
@@ -17,28 +17,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-016/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-016/common.js"></script>
-    <script type="text/javascript" src="js/gemp-016/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-016/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-016/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-016/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/cardFilter.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-016/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-016/jCards.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-016/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-016/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-016/merchantUi.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">