Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js	(revision 16859)
+++ binaries/data/mods/public/gui/session/session.js	(working copy)
@@ -912,7 +912,8 @@
 		"Cavalry",
 		"Champion",
 		"Hero",
-		"Ship"
+		"Ship",
+                "Trader"
 	];
 	var unitsCountersTypes = [
 		"unitsTrained",


Index: binaries/data/mods/public/gui/summary/layout.js
===================================================================
--- binaries/data/mods/public/gui/summary/layout.js	(revision 16859)
+++ binaries/data/mods/public/gui/summary/layout.js	(working copy)
@@ -29,7 +29,7 @@
 			{ "caption": translate("Wonders"), "yStart": 34, "width": 85 }
 		],
 		"titleHeadings": [
-			{ "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed)"), "yStart": 16, "width": (85 * 7 + 105) },	// width = 735
+			{ "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed)"), "yStart": 16, "width": (85 * 7 + 105) },	// width = 700
 		],
 		"counters": [	// counters on buildings panel
 			{"width": 105, "fn": calculateBuildings},
@@ -52,10 +52,11 @@
 			{ "caption": translate("Cavalry"), "yStart": 34, "width": 100 },
 			{ "caption": translate("Champion"), "yStart": 34, "width": 100 },
 			{ "caption": translate("Heroes"), "yStart": 34, "width": 100 },
-			{ "caption": translate("Navy"), "yStart": 34, "width": 100 }
+			{ "caption": translate("Navy"), "yStart": 34, "width": 100 },
+                        { "caption": translate("Traders"), "yStart": 34, "width": 100 }
 		],
 		"titleHeadings": [
-			{ "caption": translate("Units Statistics (Trained / Lost / Killed)"), "yStart": 16, "width": (100 * 6 + 120) },	// width = 720
+			{ "caption": translate("Units Statistics (Trained / Lost / Killed)"), "yStart": 16, "width": (100 * 7 + 120) },	// width = 820
 		],
 		"counters": [	// counters on units panel
 			{"width": 120, "fn": calculateUnits},
@@ -64,6 +65,7 @@
 			{"width": 100, "fn": calculateUnits},
 			{"width": 100, "fn": calculateUnits},
 			{"width": 100, "fn": calculateUnits},
+			{"width": 100, "fn": calculateUnits},
 			{"width": 100, "fn": calculateUnits}
 		],
 		"teamCounterFn": calculateColorsTeam


Index: binaries/data/mods/public/gui/summary/summary.js
===================================================================
--- binaries/data/mods/public/gui/summary/summary.js	(revision 16859)
+++ binaries/data/mods/public/gui/summary/summary.js	(working copy)
@@ -21,7 +21,7 @@
 const KILLED_COLOR = '[color="196 198 255"]';
 
 const BUILDINGS_TYPES = [ "total", "House", "Economic", "Outpost", "Military", "Fortress", "CivCentre", "Wonder" ];
-const UNITS_TYPES = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship" ];
+const UNITS_TYPES = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship", "Trader" ];
 const RESOURCES_TYPES = [ "food", "wood", "stone", "metal" ];
 
 // Colors used for gathered and traded resources


Index: source/tools/XpartaMuPP/LobbyRanking.py
===================================================================
--- source/tools/XpartaMuPP/LobbyRanking.py	(revision 16859)
+++ source/tools/XpartaMuPP/LobbyRanking.py	(working copy)
@@ -87,6 +87,9 @@
 	shipUnitsTrained = Column(Integer)
 	shipUnitsLost = Column(Integer)
 	enemyShipUnitsKilled = Column(Integer)
+        traderUnitsTrained = Column(Integer)
+	traderUnitsLost = Column(Integer)
+	enemyTraderUnitsKilled = Column(Integer)
 	totalBuildingsConstructed = Column(Integer)
 	totalBuildingsLost = Column(Integer)
 	enemytotalBuildingsDestroyed = Column(Integer)


Index: source/tools/XpartaMuPP/XpartaMuPP.py
===================================================================
--- source/tools/XpartaMuPP/XpartaMuPP.py	(revision 16859)
+++ source/tools/XpartaMuPP/XpartaMuPP.py	(working copy)
@@ -128,7 +128,7 @@
             'enemyWorkerUnitsKilled', 'femaleUnitsTrained', 'femaleUnitsLost', 'enemyFemaleUnitsKilled',
             'cavalryUnitsTrained', 'cavalryUnitsLost', 'enemyCavalryUnitsKilled', 'championUnitsTrained',
             'championUnitsLost', 'enemyChampionUnitsKilled', 'heroUnitsTrained', 'heroUnitsLost',
-            'enemyHeroUnitsKilled', 'shipUnitsTrained', 'shipUnitsLost', 'enemyShipUnitsKilled'}
+            'enemyHeroUnitsKilled', 'shipUnitsTrained', 'shipUnitsLost', 'enemyShipUnitsKilled', 'traderUnitsTrained', 'traderUnitsLost', 'enemyTraderUnitsKilled'}
     buildingsStats = {'totalBuildingsConstructed', 'totalBuildingsLost', 'enemytotalBuildingsDestroyed',
             'civCentreBuildingsConstructed', 'civCentreBuildingsLost', 'enemyCivCentreBuildingsDestroyed',
             'houseBuildingsConstructed', 'houseBuildingsLost', 'enemyHouseBuildingsDestroyed',


Index: binaries/data/mods/public/simulation/components/StatisticsTracker.js
===================================================================
--- binaries/data/mods/public/simulation/components/StatisticsTracker.js	(revision 16859)
+++ binaries/data/mods/public/simulation/components/StatisticsTracker.js	(working copy)
@@ -3,120 +3,124 @@
 StatisticsTracker.prototype.Schema =
 	"<a:component type='system'/><empty/>";
 
-StatisticsTracker.prototype.Init = function()
-{
-	// units
-	this.unitsClasses = [
-		"Infantry",
-		"Worker",
-		"Female",
-		"Cavalry",
-		"Champion",
-		"Hero",
-		"Ship"
-	];	
-	this.unitsTrained = {
-		"Infantry": 0,
-		"Worker": 0,
-		"Female": 0,
-		"Cavalry": 0,
-		"Champion": 0,
-		"Hero": 0,
-		"Ship": 0,
-		"total": 0
-	};
-	this.unitsLost = {
-		"Infantry": 0,
-		"Worker": 0,
-		"Female": 0,
-		"Cavalry": 0,
-		"Champion": 0,
-		"Hero": 0,
-		"Ship": 0,
-		"total": 0
-	};
-	this.unitsLostValue = 0;
-	this.enemyUnitsKilled = {
-		"Infantry": 0,
-		"Worker": 0,
-		"Female": 0,
-		"Cavalry": 0,
-		"Champion": 0,
-		"Hero": 0,
-		"Ship": 0,
-		"total": 0
-	};

-	this.enemyUnitsKilledValue = 0;
+StatisticsTracker.prototype.Init = function()
+{
+	// units
+	this.unitsClasses = [
+		"Infantry",
+		"Worker",
+		"Female",
+		"Cavalry",
+		"Champion",
+		"Hero",
+		"Ship",
+                "Trader"
+	];	
+	this.unitsTrained = {
+		"Infantry": 0,
+		"Worker": 0,
+		"Female": 0,
+		"Cavalry": 0,
+		"Champion": 0,
+		"Hero": 0,
+		"Ship": 0,
+                "Trader": 0,
+		"total": 0
+	};
+	this.unitsLost = {
+		"Infantry": 0,
+		"Worker": 0,
+		"Female": 0,
+		"Cavalry": 0,
+		"Champion": 0,
+		"Hero": 0,
+		"Ship": 0,
+                "Trader": 0,
+		"total": 0
+	};
+	this.unitsLostValue = 0;
+	this.enemyUnitsKilled = {
+		"Infantry": 0,
+		"Worker": 0,
+		"Female": 0,
+		"Cavalry": 0,
+		"Champion": 0,
+		"Hero": 0,
+		"Ship": 0,
+                "Trader": 0,
+		"total": 0
+	};
+	this.enemyUnitsKilledValue = 0;