diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
index ee2236bc9..f29194133 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
@@ -95,16 +95,16 @@
     <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-007/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-007/common.js"></script>
-    <script type="text/javascript" src="js/gemp-007/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-007/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-007/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-007/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-007/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-007/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-008/common.js"></script>
+    <script type="text/javascript" src="js/gemp-008/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-008/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-008/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-008/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-008/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-008/cardFilter.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
index 6b95c3629..c79a1c11d 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
@@ -320,16 +320,16 @@ body {
 <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
 <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-007/communication.js"></script>
-<script type="text/javascript" src="js/gemp-007/common.js"></script>
-<script type="text/javascript" src="js/gemp-007/chat.js"></script>
-<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
-<script type="text/javascript" src="js/gemp-007/logging.js"></script>
+<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-008/communication.js"></script>
+<script type="text/javascript" src="js/gemp-008/common.js"></script>
+<script type="text/javascript" src="js/gemp-008/chat.js"></script>
+<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-008/logging.js"></script>
 
 <script type="text/javascript">
     var ui;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
index fe172e9cc..45067e979 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
@@ -176,20 +176,20 @@
 <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
 <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
 
-<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-007/common.js"></script>
-<script type="text/javascript" src="js/gemp-007/logging.js"></script>
-<script type="text/javascript" src="js/gemp-007/chat.js"></script>
-<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-007/communication.js"></script>
+<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-008/common.js"></script>
+<script type="text/javascript" src="js/gemp-008/logging.js"></script>
+<script type="text/javascript" src="js/gemp-008/chat.js"></script>
+<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/tournamentResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-008/communication.js"></script>
 <!-- This is needed for delivery -->
-<script type="text/javascript" src="js/gemp-007/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-008/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
 
 <script type="text/javascript">
     var chat;
@@ -231,11 +231,11 @@
 
                 var infoDialog = $("<div></div>")
                         .dialog({
-                    autoOpen:false,
-                    closeOnEscape:true,
-                    resizable:false,
-                    title:"Card information"
-                });
+                            autoOpen:false,
+                            closeOnEscape:true,
+                            resizable:false,
+                            title:"Card information"
+                        });
 
                 $("body").click(
                         function (event) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
index abe62087c..0f6df9ad1 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
@@ -23,9 +23,9 @@
     <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
     <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
 
-    <script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-007/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-007/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-008/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-008/communication.js"></script>
 
     <script type="text/javascript">
         function getUrlParam(param) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/cardFilter.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/chat.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/chat.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/chat.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/common.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/common.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/common.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/commonUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/commonUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/communication.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/communication.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/communication.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/deliveryService.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/deliveryService.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameAnimations.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameHistoryUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/hallUi.js
similarity index 85%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/hallUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/hallUi.js
index 55630d28d..e9467706f 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/hallUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/hallUi.js
@@ -49,15 +49,15 @@ var GempLotrHallUI = Class.extend({
 
         var editDeck = $("<button>Deck builder</button>");
         editDeck.button().click(
-                function () {
-                    location.href = 'deckBuild.html';
-                });
+            function () {
+                location.href = 'deckBuild.html';
+            });
 
         var merchant = $("<button>Merchant</button>");
         merchant.button().click(
-                function () {
-                    location.href = 'merchant.html';
-                });
+            function () {
+                location.href = 'merchant.html';
+            });
 
         this.buttonsDiv.append(editDeck);
         this.buttonsDiv.append(" | ");
@@ -74,17 +74,17 @@ var GempLotrHallUI = Class.extend({
 
         this.createTableButton = $("<button>Create table</button>");
         $(this.createTableButton).button().click(
-                function () {
-                    that.supportedFormatsSelect.hide();
-                    that.decksSelect.hide();
-                    that.createTableButton.hide();
-                    var format = that.supportedFormatsSelect.val();
-                    var deck = that.decksSelect.val();
-                    if (deck != null)
-                        that.comm.createTable(format, deck, function (xml) {
-                            that.processResponse(xml);
-                        });
-                });
+            function () {
+                that.supportedFormatsSelect.hide();
+                that.decksSelect.hide();
+                that.createTableButton.hide();
+                var format = that.supportedFormatsSelect.val();
+                var deck = that.decksSelect.val();
+                if (deck != null)
+                    that.comm.createTable(format, deck, function (xml) {
+                        that.processResponse(xml);
+                    });
+            });
         this.createTableButton.hide();
 
         this.decksSelect = $("<select style='width: 220px'></select>");
@@ -98,10 +98,10 @@ var GempLotrHallUI = Class.extend({
 
         this.leaveTableButton = $("<button>Leave table</button>");
         $(this.leaveTableButton).button().click(
-                function () {
-                    that.leaveTableButton.hide();
-                    that.comm.leaveTable();
-                });
+            function () {
+                that.leaveTableButton.hide();
+                that.comm.leaveTable();
+            });
         this.leaveTableButton.hide();
 
         this.buttonsDiv.append(this.leaveTableButton);
@@ -267,24 +267,24 @@ var GempLotrHallUI = Class.extend({
         if (joined != "true") {
             var but = $("<button>Join queue</button>");
             $(but).button().click(
-                    function (event) {
-                        var deck = that.decksSelect.val();
-                        if (deck != null)
-                            that.comm.joinQueue(id, deck, function (xml) {
-                                that.processResponse(xml);
-                            });
-                    });
+                function (event) {
+                    var deck = that.decksSelect.val();
+                    if (deck != null)
+                        that.comm.joinQueue(id, deck, function (xml) {
+                            that.processResponse(xml);
+                        });
+                });
             actionsField.append(but);
         } else {
             var but = $("<button>Leave queue</button>");
             $(but).button().click(
-                    function (event) {
-                        var deck = that.decksSelect.val();
-                        if (deck != null)
-                            that.comm.leaveQueue(id, deck, function (xml) {
-                                that.processResponse(xml);
-                            });
-                    });
+                function (event) {
+                    var deck = that.decksSelect.val();
+                    if (deck != null)
+                        that.comm.leaveQueue(id, deck, function (xml) {
+                            that.processResponse(xml);
+                        });
+                });
             actionsField.append(but);
         }
 
@@ -319,13 +319,13 @@ var GempLotrHallUI = Class.extend({
             if (!waiting) {
                 var but = $("<button>Join table</button>");
                 $(but).button().click(
-                        function (event) {
-                            var deck = that.decksSelect.val();
-                            if (deck != null)
-                                that.comm.joinTable(id, deck, function (xml) {
-                                    that.processResponse(xml);
-                                });
-                        });
+                    function (event) {
+                        var deck = that.decksSelect.val();
+                        if (deck != null)
+                            that.comm.joinTable(id, deck, function (xml) {
+                                that.processResponse(xml);
+                            });
+                    });
                 actionsField.append(but);
             }
         }
@@ -333,13 +333,13 @@ var GempLotrHallUI = Class.extend({
         if (status == "Playing" || status == "Preparation") {
             var but = $("<button>Watch game</button>");
             $(but).button().click(
-                    function (event) {
-                        var participantId = getUrlParam("participantId");
-                        var participantIdAppend = "";
-                        if (participantId != null)
-                            participantIdAppend = "&participantId=" + participantId;
-                        location.href = "/gemp-lotr/game.html?gameId=" + gameId + participantIdAppend;
-                    });
+                function (event) {
+                    var participantId = getUrlParam("participantId");
+                    var participantIdAppend = "";
+                    if (participantId != null)
+                        participantIdAppend = "&participantId=" + participantId;
+                    location.href = "/gemp-lotr/game.html?gameId=" + gameId + participantIdAppend;
+                });
             actionsField.append(but);
         }
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/inheritance.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/inheritance.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/jCardGroup.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/jCards.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/jCards.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/leagueResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/logging.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/logging.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/logging.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/merchantUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/merchantUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/tournamentResultsUi.js
similarity index 84%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/tournamentResultsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/tournamentResultsUi.js
index 26e98898d..a24248292 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/tournamentResultsUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/tournamentResultsUi.js
@@ -4,17 +4,17 @@ var TournamentResultsUI = Class.extend({
 
     init:function (url) {
         this.communication = new GempLotrCommunication(url,
-                function (xhr, ajaxOptions, thrownError) {
-                });
+            function (xhr, ajaxOptions, thrownError) {
+            });
 
         this.formatDialog = $("<div></div>")
-                .dialog({
-            autoOpen:false,
-            closeOnEscape:true,
-            resizable:false,
-            modal:true,
-            title:"Format description"
-        });
+            .dialog({
+                autoOpen:false,
+                closeOnEscape:true,
+                resizable:false,
+                modal:true,
+                title:"Format description"
+            });
 
         this.loadLiveTournaments();
     },
@@ -22,17 +22,17 @@ var TournamentResultsUI = Class.extend({
     loadLiveTournaments:function () {
         var that = this;
         this.communication.getLiveTournaments(
-                function (xml) {
-                    that.loadedTournaments(xml);
-                });
+            function (xml) {
+                that.loadedTournaments(xml);
+            });
     },
 
-    loadHistoryTournaments: function() {
+    loadHistoryTournaments:function () {
         var that = this;
         this.communication.getHistoryTournaments(
-                function (xml) {
-                    that.loadedTournaments(xml);
-                });
+            function (xml) {
+                that.loadedTournaments(xml);
+            });
     },
 
     loadedTournament:function (xml) {
@@ -85,14 +85,14 @@ var TournamentResultsUI = Class.extend({
 
                 var detailsBut = $("<button>See details</button>").button();
                 detailsBut.click(
-                        (function (id) {
-                            return function () {
-                                that.communication.getTournament(id,
-                                        function (xml) {
-                                            that.loadedTournament(xml);
-                                        });
-                            };
-                        })(tournamentId));
+                    (function (id) {
+                        return function () {
+                            that.communication.getTournament(id,
+                                function (xml) {
+                                    that.loadedTournament(xml);
+                                });
+                        };
+                    })(tournamentId));
                 $("#tournamentResults").append(detailsBut);
             }
             if (tournaments.length == 0)
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
index dc884d474..4319e802d 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
@@ -34,14 +34,14 @@
     <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-007/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-007/common.js"></script>
-    <script type="text/javascript" src="js/gemp-007/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-007/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-007/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-008/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-008/common.js"></script>
+    <script type="text/javascript" src="js/gemp-008/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-008/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-008/logging.js"></script>
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
             var data = {};
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
index eeb509f7b..6bd74a389 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
@@ -95,16 +95,16 @@
     <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-007/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-007/common.js"></script>
-    <script type="text/javascript" src="js/gemp-007/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-007/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-007/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-007/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-007/merchantUi.js"></script>
-    <script type="text/javascript" src="js/gemp-007/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-008/common.js"></script>
+    <script type="text/javascript" src="js/gemp-008/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-008/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-008/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-008/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-008/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-008/cardFilter.js"></script>
 
     <script type="text/javascript">