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 9e0a0df22..f1d4c602f 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-015/merchantUi.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">
 
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 fda6c3042..6c9d0beea 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.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="/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-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-015/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-015/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi2.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">
 
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 e031c2383..a5c1d6fac 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-015/merchantUi.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">
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 9ee1d5526..47b15d704 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-015/merchantUi.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">
     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 60b5bd19e..de34bcb6b 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-015/merchantUi.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">
         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 059529599..6895e5f82 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-015/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-015/common.js"></script>
-<script type="text/javascript" src="js/gemp-015/logging.js"></script>
-<script type="text/javascript" src="js/gemp-015/chat.js"></script>
-<script type="text/javascript" src="js/gemp-015/communication.js"></script>
-<script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-015/merchantUi.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>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/CardInformationDialog.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/CardInformationDialog.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/CardInformationDialog.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/CardInformationDialog.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/DeckPanel.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/DeckPanel.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/DeckPanel.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/DeckPanel.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/cardFilter.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/cardFilter2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/cardFilter2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/chat.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/chat.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/chat.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/common.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/common.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/common.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/commonUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/commonUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/communication.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/communication.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/communication.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/deckBuildingUi2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/deckBuildingUi2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deckBuildingUi2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/deliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/deliveryService.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/gameAnimations.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/gameAnimations.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/gameHistoryUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/gameUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/gameUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/hallUi.js
similarity index 96%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/hallUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/hallUi.js
index 00d72b38e..b1f387edc 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/hallUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/hallUi.js
@@ -604,7 +604,7 @@ var GempLotrHallUI = Class.extend({
                         lastField.append(but);
                     }
 
-                    if (playing == "true" && status=="PLAYING") {
+                    if (playing == "true" && status == "PLAYING") {
                         var participantId = getUrlParam("participantId");
                         var participantIdAppend = "";
                         if (participantId != null)
@@ -687,8 +687,13 @@ var GempLotrHallUI = Class.extend({
                 var participantIdAppend = "";
                 if (participantId != null)
                     participantIdAppend = "&participantId=" + participantId;
-                this.tablesDiv.append("<embed src='/gemp-lotr/fanfare_x.wav' hidden='true' autostart='true' loop='false'>");
+                var soundPlay = $("<embed src='/gemp-lotr/fanfare_x.wav' hidden='true' autostart='true' loop='false'>");
+                this.tablesDiv.append(soundPlay);
                 window.open("/gemp-lotr/game.html?gameId=" + waitingGameId + participantIdAppend, "_blank");
+                setTimeout(
+                    function() {
+                        soundPlay.remove();
+                    }, 2000);
             }
 
             if (!this.supportedFormatsInitialized) {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/inheritance.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/inheritance.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/jCardGroup.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/jCardGroup.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/jCards.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/leagueResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/logging.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/logging.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/logging.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/merchantUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/merchantUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/playerStatsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/playerStatsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/playerStatsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/playerStatsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/statsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/statsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/statsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/statsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/tournamentResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-015/tournamentResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/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 0e2f96382..8221d0efc 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-015/merchantUi.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">
         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 b1a0f0f59..101ea6c50 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-015/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-015/common.js"></script>
-    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/cardFilter.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-015/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-015/jCards.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-015/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-015/merchantUi.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">