diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
index 2d9ec691d..fda6c3042 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/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-014/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-014/common.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="/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-014/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-014/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-014/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-014/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-014/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-014/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-014/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-014/deckBuildingUi2.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">
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js.inc b/gemp-lotr/gemp-lotr-web/src/main/webapp/js.inc
index deeaeddd9..059529599 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js.inc
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/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-014/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-014/common.js"></script>
-<script type="text/javascript" src="js/gemp-014/logging.js"></script>
-<script type="text/javascript" src="js/gemp-014/chat.js"></script>
-<script type="text/javascript" src="js/gemp-014/communication.js"></script>
-<script type="text/javascript" src="js/gemp-014/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-014/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/cardFilter.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-014/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-014/jCards.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-014/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/deckBuildingUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-014/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-014/merchantUi.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>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/CardInformationDialog.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/CardInformationDialog.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/CardInformationDialog.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/CardInformationDialog.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/DeckPanel.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/DeckPanel.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/DeckPanel.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/DeckPanel.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/cardFilter.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/cardFilter2.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/cardFilter2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/cardFilter2.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/cardFilter2.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/chat.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/chat.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/chat.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/common.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/common.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/common.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/commonUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/commonUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/communication.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/communication.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/communication.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/deckBuildingUi2.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/deckBuildingUi2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/deckBuildingUi2.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/deckBuildingUi2.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/deliveryService.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/deliveryService.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/gameAnimations.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/gameHistoryUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/gameUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/hallUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/hallUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/hallUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/inheritance.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/inheritance.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/jCardGroup.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/jCards.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/jCards.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/leagueResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/logging.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/logging.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/logging.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/merchantUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/merchantUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/playerStatsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/playerStatsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/playerStatsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/playerStatsUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/statsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/statsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/statsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/statsUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/tournamentResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/tournamentResultsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-015/tournamentResultsUi.js