TDB 335.58 - 2015/03/21TDB335.58

358 files changed, 154 insertions, 161 deletions

diff --git a/revision.h.in.cmake b/revision.h.in.cmake
index bd60a6834a2..eab0437c600 100644
--- a/revision.h.in.cmake
+++ b/revision.h.in.cmake
@@ -5,7 +5,7 @@
  #define _BRANCH                    "@rev_branch@"
  #define _SOURCE_DIRECTORY          "@CMAKE_SOURCE_DIR@"
  #define _MYSQL_EXECUTABLE          "@MYSQL_EXECUTABLE@"
- #define _FULL_DATABASE             "TDB_full_335.57_2014_10_19.sql"
+ #define _FULL_DATABASE             "TDB_full_335.58_2015_03_21.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2015 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index b1bf9666a8c..2ad3b17b9f9 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.15  Distrib 10.0.15-MariaDB, for Win64 (x86)
+-- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
 --
--- Host: localhost    Database: auth
+-- Host: localhost    Database: auth335
 -- ------------------------------------------------------
--- Server version   10.0.15-MariaDB
+-- Server version	5.6.9-rc
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -347,7 +347,7 @@ CREATE TABLE `rbac_default_permissions` (
 
 LOCK TABLES `rbac_default_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_default_permissions` VALUES (0,195,-1),(1,194,-1),(2,193,-1),(3,192,-1);
+INSERT INTO `rbac_default_permissions` VALUES (3,192,-1),(2,193,-1),(1,194,-1),(0,195,-1);
 /*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -459,11 +459,62 @@ CREATE TABLE `realmlist` (
 
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
-INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,1,0,1,0,0,12340);
+INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,12340);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates`
+--
+
+LOCK TABLES `updates` WRITE;
+/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
+INSERT INTO `updates` VALUES ('2014_11_10_00_auth.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 21:44:12',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_21_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_00_auth.sql','E8C5B74BB45F0F35DEC182C72BACF435C7066FB0','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_01_auth.sql','862961815354DA2746F5F71FBC8155F57CBE75AB','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_02_auth.sql','33E4F94086590768EF5D4855DD43D7DE7C06ADA4','ARCHIVED','2015-03-21 21:44:51',0);
+/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates_include`
+--
+
+LOCK TABLES `updates_include` WRITE;
+/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
+INSERT INTO `updates_include` VALUES ('$/sql/updates/auth','RELEASED'),('$/sql/custom/auth','RELEASED'),('$/sql/old/3.3.5a/auth','ARCHIVED');
+/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `uptime`
 --
 
@@ -498,44 +549,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2014-12-21 20:42:33
-
--- Updates base tables
-DROP TABLE IF EXISTS `updates`;
-CREATE TABLE `updates` (
-    `name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
-    `hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
-    `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
-    `speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
-    PRIMARY KEY (`name`)
-)
-COMMENT='List of all applied updates in this database.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
-DROP TABLE IF EXISTS `updates_include`;
-CREATE TABLE `updates_include` (
-    `path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
-    PRIMARY KEY (`path`)
-)
-COMMENT='List of directories where we want to include sql updates.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
--- Auth database update data
-TRUNCATE TABLE `updates_include`;
-INSERT INTO `updates_include` (`path`, `state`) VALUES
-('$/sql/updates/auth', 'RELEASED'),
-('$/sql/custom/auth', 'RELEASED'),
-('$/sql/old/3.3.5a/auth', 'ARCHIVED');
-
-INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
-('2014_11_10_00_auth.sql', '0E3CB119442D09DD88E967015319BBC8DAFBBFE0'),
-('2014_11_10_01_auth.sql', '327E77A1DA3546D5275AB249915DD57EDD6FDD3D'),
-('2014_12_10_00_auth.sql', '821703A96D80F9080074852B5A46E2909C9562EA'),
-('2014_12_21_00_auth.sql', 'CE2E5D2CD82E79C25294539ADED27A1429105B43'),
-('2015_03_20_00_auth.sql', 'E8C5B74BB45F0F35DEC182C72BACF435C7066FB0'),
-('2015_03_20_01_auth.sql', '862961815354DA2746F5F71FBC8155F57CBE75AB'),
-('2015_03_20_02_auth.sql', '');
+-- Dump completed on 2015-03-21 21:48:22
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 795be321d7d..a85591767d4 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.5.40, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
 --
--- Host: localhost    Database: characters
+-- Host: localhost    Database: characters335
 -- ------------------------------------------------------
--- Server version	5.5.40-0ubuntu0.14.04.1
+-- Server version	5.6.9-rc
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2489,6 +2489,57 @@ LOCK TABLES `reserved_name` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates`
+--
+
+LOCK TABLES `updates` WRITE;
+/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
+INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0);
+/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates_include`
+--
+
+LOCK TABLES `updates_include` WRITE;
+/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
+INSERT INTO `updates_include` VALUES ('$/sql/updates/characters','RELEASED'),('$/sql/custom/characters','RELEASED'),('$/sql/old/3.3.5a/characters','ARCHIVED');
+/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `warden_action`
 --
 
@@ -2545,40 +2596,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2014-10-18 18:02:06
-
--- Updates base tables
-DROP TABLE IF EXISTS `updates`;
-CREATE TABLE `updates` (
-    `name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
-    `hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
-    `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
-    `speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
-    PRIMARY KEY (`name`)
-)
-COMMENT='List of all applied updates in this database.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
-DROP TABLE IF EXISTS `updates_include`;
-CREATE TABLE `updates_include` (
-    `path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
-    PRIMARY KEY (`path`)
-)
-COMMENT='List of directories where we want to include sql updates.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
--- Characters database update data
-TRUNCATE TABLE `updates_include`;
-INSERT INTO `updates_include` (`path`, `state`) VALUES
-('$/sql/updates/characters', 'RELEASED'),
-('$/sql/custom/characters', 'RELEASED'),
-('$/sql/old/3.3.5a/characters', 'ARCHIVED');
-
-INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
-('2015_03_20_00_characters.sql', 'B761760804EA73BD297F296C5C1919687DF7191C'),
-('2015_03_20_01_characters.sql', '894F08B70449A5481FFAF394EE5571D7FC4D8A3A'),
-('2015_03_20_02_characters.sql', '');
+-- Dump completed on 2015-03-21 21:48:11
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 82d08621789..40e1712cc80 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -3528,6 +3528,37 @@ CREATE TABLE `trinity_string` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `vehicle_accessory`
 --
 
@@ -3674,4 +3705,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2014-10-30 13:28:50
+-- Dump completed on 2015-03-21 21:47:40
diff --git a/sql/updates/auth/2014_11_10_00_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2014_11_10_00_auth.sql
index 088c5cc71b5..088c5cc71b5 100644
--- a/sql/updates/auth/2014_11_10_00_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2014_11_10_00_auth.sql
diff --git a/sql/updates/auth/2014_11_10_01_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2014_11_10_01_auth.sql
index 0f89140ecf4..0f89140ecf4 100644
--- a/sql/updates/auth/2014_11_10_01_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2014_11_10_01_auth.sql
diff --git a/sql/updates/auth/2014_12_10_00_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2014_12_10_00_auth.sql
index 8068fd3c459..8068fd3c459 100644
--- a/sql/updates/auth/2014_12_10_00_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2014_12_10_00_auth.sql
diff --git a/sql/updates/auth/2014_12_21_00_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2014_12_21_00_auth.sql
index ddea3d335ff..ddea3d335ff 100644
--- a/sql/updates/auth/2014_12_21_00_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2014_12_21_00_auth.sql
diff --git a/sql/updates/auth/2015_03_20_00_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2015_03_20_00_auth.sql
index 69e4d38f0d2..69e4d38f0d2 100644
--- a/sql/updates/auth/2015_03_20_00_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2015_03_20_00_auth.sql
diff --git a/sql/updates/auth/2015_03_20_01_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2015_03_20_01_auth.sql
index 970243fd278..970243fd278 100644
--- a/sql/updates/auth/2015_03_20_01_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2015_03_20_01_auth.sql
diff --git a/sql/updates/auth/2015_03_20_02_auth.sql b/sql/old/3.3.5a/auth/57_2014_10_19/2015_03_20_02_auth.sql
index 71abadebf60..71abadebf60 100644
--- a/sql/updates/auth/2015_03_20_02_auth.sql
+++ b/sql/old/3.3.5a/auth/57_2014_10_19/2015_03_20_02_auth.sql
diff --git a/sql/old/3.3.5a/auth/CREATE_SUBDIRECTORIES_HERE b/sql/old/3.3.5a/auth/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/3.3.5a/auth/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/characters/2015_03_20_00_characters.sql b/sql/old/3.3.5a/characters/57_2014_10_19/2015_03_20_00_characters.sql
index 05c120274da..05c120274da 100644
--- a/sql/updates/characters/2015_03_20_00_characters.sql
+++ b/sql/old/3.3.5a/characters/57_2014_10_19/2015_03_20_00_characters.sql
diff --git a/sql/updates/characters/2015_03_20_01_characters.sql b/sql/old/3.3.5a/characters/57_2014_10_19/2015_03_20_01_characters.sql
index 2655d4884a5..2655d4884a5 100644
--- a/sql/updates/characters/2015_03_20_01_characters.sql
+++ b/sql/old/3.3.5a/characters/57_2014_10_19/2015_03_20_01_characters.sql
diff --git a/sql/updates/characters/2015_03_20_02_characters.sql b/sql/old/3.3.5a/characters/57_2014_10_19/2015_03_20_02_characters.sql
index 5fcc42d4614..5fcc42d4614 100644
--- a/sql/updates/characters/2015_03_20_02_characters.sql
+++ b/sql/old/3.3.5a/characters/57_2014_10_19/2015_03_20_02_characters.sql
diff --git a/sql/old/3.3.5a/characters/CREATE_SUBDIRECTORIES_HERE b/sql/old/3.3.5a/characters/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/3.3.5a/characters/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/world/2014_10_19_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_19_00_world.sql
index b5a7cd31e60..b5a7cd31e60 100644
--- a/sql/updates/world/2014_10_19_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_19_00_world.sql
diff --git a/sql/updates/world/2014_10_19_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_19_01_world.sql
index b5048704717..b5048704717 100644
--- a/sql/updates/world/2014_10_19_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_19_01_world.sql
diff --git a/sql/updates/world/2014_10_20_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_20_00_world.sql
index 89a6eb089d6..89a6eb089d6 100644
--- a/sql/updates/world/2014_10_20_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_20_00_world.sql
diff --git a/sql/updates/world/2014_10_21_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_21_00_world.sql
index 9a8b68bd99c..9a8b68bd99c 100644
--- a/sql/updates/world/2014_10_21_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_21_00_world.sql
diff --git a/sql/updates/world/2014_10_22_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_22_00_world.sql
index d82916f71b8..d82916f71b8 100644
--- a/sql/updates/world/2014_10_22_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_22_00_world.sql
diff --git a/sql/updates/world/2014_10_23_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_23_00_world.sql
index ae441b6bee5..ae441b6bee5 100644
--- a/sql/updates/world/2014_10_23_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_23_00_world.sql
diff --git a/sql/updates/world/2014_10_23_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_23_01_world.sql
index a5070a473da..a5070a473da 100644
--- a/sql/updates/world/2014_10_23_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_23_01_world.sql
diff --git a/sql/updates/world/2014_10_24_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_24_00_world.sql
index b4a3087b89d..b4a3087b89d 100644
--- a/sql/updates/world/2014_10_24_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_24_00_world.sql
diff --git a/sql/updates/world/2014_10_24_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_24_01_world.sql
index 8a3a9c8be3d..8a3a9c8be3d 100644
--- a/sql/updates/world/2014_10_24_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_24_01_world.sql
diff --git a/sql/updates/world/2014_10_26_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_26_00_world.sql
index 2d9c9c57d50..2d9c9c57d50 100644
--- a/sql/updates/world/2014_10_26_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_26_00_world.sql
diff --git a/sql/updates/world/2014_10_27_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_27_00_world.sql
index d4526804133..d4526804133 100644
--- a/sql/updates/world/2014_10_27_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_27_00_world.sql
diff --git a/sql/updates/world/2014_10_27_01_world_335.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_27_01_world_335.sql
index 443603fca24..443603fca24 100644
--- a/sql/updates/world/2014_10_27_01_world_335.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_27_01_world_335.sql
diff --git a/sql/updates/world/2014_10_27_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_27_02_world.sql
index 8bc4564b2f3..8bc4564b2f3 100644
--- a/sql/updates/world/2014_10_27_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_27_02_world.sql
diff --git a/sql/updates/world/2014_10_28_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_28_00_world.sql
index bdb90e47854..bdb90e47854 100644
--- a/sql/updates/world/2014_10_28_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_28_00_world.sql
diff --git a/sql/updates/world/2014_10_29_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_29_00_world.sql
index f29b6745133..f29b6745133 100644
--- a/sql/updates/world/2014_10_29_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_29_00_world.sql
diff --git a/sql/updates/world/2014_10_30_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_30_00_world.sql
index 30c528cf3f0..30c528cf3f0 100644
--- a/sql/updates/world/2014_10_30_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_30_00_world.sql
diff --git a/sql/updates/world/2014_10_30_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_30_02_world.sql
index a3de351d578..a3de351d578 100644
--- a/sql/updates/world/2014_10_30_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_10_30_02_world.sql
diff --git a/sql/updates/world/2014_11_01_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_00_world.sql
index 6623f1e00b1..6623f1e00b1 100644
--- a/sql/updates/world/2014_11_01_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_00_world.sql
diff --git a/sql/updates/world/2014_11_01_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_01_world.sql
index 4f1b4f738db..4f1b4f738db 100644
--- a/sql/updates/world/2014_11_01_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_01_world.sql
diff --git a/sql/updates/world/2014_11_01_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_02_world.sql
index 3bb7e3a033b..3bb7e3a033b 100644
--- a/sql/updates/world/2014_11_01_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_02_world.sql
diff --git a/sql/updates/world/2014_11_01_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_03_world.sql
index dad3773f912..dad3773f912 100644
--- a/sql/updates/world/2014_11_01_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_01_03_world.sql
diff --git a/sql/updates/world/2014_11_02_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_02_00_world.sql
index adf9c036723..adf9c036723 100644
--- a/sql/updates/world/2014_11_02_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_02_00_world.sql
diff --git a/sql/updates/world/2014_11_02_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_02_01_world.sql
index 9003dd15c74..9003dd15c74 100644
--- a/sql/updates/world/2014_11_02_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_02_01_world.sql
diff --git a/sql/updates/world/2014_11_04_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_04_00_world.sql
index 8fdd922f8f9..8fdd922f8f9 100644
--- a/sql/updates/world/2014_11_04_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_04_00_world.sql
diff --git a/sql/updates/world/2014_11_05_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_05_00_world.sql
index e6969ee08ab..e6969ee08ab 100644
--- a/sql/updates/world/2014_11_05_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_05_00_world.sql
diff --git a/sql/updates/world/2014_11_07_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_00_world.sql
index f10ca6690e0..f10ca6690e0 100644
--- a/sql/updates/world/2014_11_07_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_00_world.sql
diff --git a/sql/updates/world/2014_11_07_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_01_world.sql
index 9586e499b69..9586e499b69 100644
--- a/sql/updates/world/2014_11_07_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_01_world.sql
diff --git a/sql/updates/world/2014_11_07_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_02_world.sql
index 9b6f625e1e4..9b6f625e1e4 100644
--- a/sql/updates/world/2014_11_07_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_02_world.sql
diff --git a/sql/updates/world/2014_11_07_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_03_world.sql
index 8516c42d5f9..8516c42d5f9 100644
--- a/sql/updates/world/2014_11_07_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_07_03_world.sql
diff --git a/sql/updates/world/2014_11_08_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_08_00_world.sql
index 08f64d64bd3..08f64d64bd3 100644
--- a/sql/updates/world/2014_11_08_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_08_00_world.sql
diff --git a/sql/updates/world/2014_11_09_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_09_00_world.sql
index 3cb00316183..3cb00316183 100644
--- a/sql/updates/world/2014_11_09_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_09_00_world.sql
diff --git a/sql/updates/world/2014_11_10_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_00_world.sql
index e4397cd6bde..e4397cd6bde 100644
--- a/sql/updates/world/2014_11_10_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_00_world.sql
diff --git a/sql/updates/world/2014_11_10_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_01_world.sql
index a00c24ab57b..a00c24ab57b 100644
--- a/sql/updates/world/2014_11_10_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_01_world.sql
diff --git a/sql/updates/world/2014_11_10_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_02_world.sql
index dd854fea9be..dd854fea9be 100644
--- a/sql/updates/world/2014_11_10_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_02_world.sql
diff --git a/sql/updates/world/2014_11_10_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_03_world.sql
index 41044e8c7ef..41044e8c7ef 100644
--- a/sql/updates/world/2014_11_10_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_03_world.sql
diff --git a/sql/updates/world/2014_11_10_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_04_world.sql
index 1b4857e4724..1b4857e4724 100644
--- a/sql/updates/world/2014_11_10_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_04_world.sql
diff --git a/sql/updates/world/2014_11_10_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_05_world.sql
index 2ffd85afa5e..2ffd85afa5e 100644
--- a/sql/updates/world/2014_11_10_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_10_05_world.sql
diff --git a/sql/updates/world/2014_11_11_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_11_00_world.sql
index addb4092f44..addb4092f44 100644
--- a/sql/updates/world/2014_11_11_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_11_00_world.sql
diff --git a/sql/updates/world/2014_11_11_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_11_01_world.sql
index 346459b9556..346459b9556 100644
--- a/sql/updates/world/2014_11_11_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_11_01_world.sql
diff --git a/sql/updates/world/2014_11_13_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_13_00_world.sql
index baa87a86e7e..baa87a86e7e 100644
--- a/sql/updates/world/2014_11_13_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_13_00_world.sql
diff --git a/sql/updates/world/2014_11_16_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_16_00_world.sql
index 939c43f7056..939c43f7056 100644
--- a/sql/updates/world/2014_11_16_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_16_00_world.sql
diff --git a/sql/updates/world/2014_11_17_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_17_00_world.sql
index f96248d0f64..f96248d0f64 100644
--- a/sql/updates/world/2014_11_17_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_17_00_world.sql
diff --git a/sql/updates/world/2014_11_19_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_19_00_world.sql
index d2b188cbf69..d2b188cbf69 100644
--- a/sql/updates/world/2014_11_19_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_19_00_world.sql
diff --git a/sql/updates/world/2014_11_19_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_19_01_world.sql
index d034a50789f..d034a50789f 100644
--- a/sql/updates/world/2014_11_19_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_19_01_world.sql
diff --git a/sql/updates/world/2014_11_19_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_19_02_world.sql
index 635c31be96c..635c31be96c 100644
--- a/sql/updates/world/2014_11_19_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_19_02_world.sql
diff --git a/sql/updates/world/2014_11_20_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_00_world.sql
index 5425c1acad0..5425c1acad0 100644
--- a/sql/updates/world/2014_11_20_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_00_world.sql
diff --git a/sql/updates/world/2014_11_20_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_01_world.sql
index 75474e72596..75474e72596 100644
--- a/sql/updates/world/2014_11_20_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_01_world.sql
diff --git a/sql/updates/world/2014_11_20_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_02_world.sql
index c96d6dd9100..c96d6dd9100 100644
--- a/sql/updates/world/2014_11_20_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_02_world.sql
diff --git a/sql/updates/world/2014_11_20_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_03_world.sql
index eab63880696..eab63880696 100644
--- a/sql/updates/world/2014_11_20_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_03_world.sql
diff --git a/sql/updates/world/2014_11_20_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_04_world.sql
index aa5b1641320..aa5b1641320 100644
--- a/sql/updates/world/2014_11_20_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_04_world.sql
diff --git a/sql/updates/world/2014_11_20_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_05_world.sql
index 1a8ac671e94..1a8ac671e94 100644
--- a/sql/updates/world/2014_11_20_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_20_05_world.sql
diff --git a/sql/updates/world/2014_11_21_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_21_00_world.sql
index f8b1962bf1d..f8b1962bf1d 100644
--- a/sql/updates/world/2014_11_21_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_21_00_world.sql
diff --git a/sql/updates/world/2014_11_21_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_21_01_world.sql
index ad93939dd52..ad93939dd52 100644
--- a/sql/updates/world/2014_11_21_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_21_01_world.sql
diff --git a/sql/updates/world/2014_11_21_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_21_02_world.sql
index 52a6ddc10f2..52a6ddc10f2 100644
--- a/sql/updates/world/2014_11_21_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_21_02_world.sql
diff --git a/sql/updates/world/2014_11_22_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_22_00_world.sql
index 0fa71070aef..0fa71070aef 100644
--- a/sql/updates/world/2014_11_22_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_22_00_world.sql
diff --git a/sql/updates/world/2014_11_23_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_00_world.sql
index 3e1d466583f..3e1d466583f 100644
--- a/sql/updates/world/2014_11_23_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_00_world.sql
diff --git a/sql/updates/world/2014_11_23_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_01_world.sql
index 193795acf99..193795acf99 100644
--- a/sql/updates/world/2014_11_23_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_01_world.sql
diff --git a/sql/updates/world/2014_11_23_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_02_world.sql
index d5263274bdc..d5263274bdc 100644
--- a/sql/updates/world/2014_11_23_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_02_world.sql
diff --git a/sql/updates/world/2014_11_23_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_03_world.sql
index f8dbb95dbf7..f8dbb95dbf7 100644
--- a/sql/updates/world/2014_11_23_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_03_world.sql
diff --git a/sql/updates/world/2014_11_23_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_04_world.sql
index 6dc657b39e9..6dc657b39e9 100644
--- a/sql/updates/world/2014_11_23_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_23_04_world.sql
diff --git a/sql/updates/world/2014_11_24_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_00_world.sql
index 0c6d5735165..0c6d5735165 100644
--- a/sql/updates/world/2014_11_24_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_00_world.sql
diff --git a/sql/updates/world/2014_11_24_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_01_world.sql
index 77f8ca71f5e..77f8ca71f5e 100644
--- a/sql/updates/world/2014_11_24_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_01_world.sql
diff --git a/sql/updates/world/2014_11_24_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_02_world.sql
index 97e5a9abaa4..97e5a9abaa4 100644
--- a/sql/updates/world/2014_11_24_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_02_world.sql
diff --git a/sql/updates/world/2014_11_24_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_03_world.sql
index afde0f04e51..afde0f04e51 100644
--- a/sql/updates/world/2014_11_24_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_03_world.sql
diff --git a/sql/updates/world/2014_11_24_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_04_world.sql
index bbca1631efe..bbca1631efe 100644
--- a/sql/updates/world/2014_11_24_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_24_04_world.sql
diff --git a/sql/updates/world/2014_11_25_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_25_00_world.sql
index 584a96f9511..584a96f9511 100644
--- a/sql/updates/world/2014_11_25_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_25_00_world.sql
diff --git a/sql/updates/world/2014_11_25_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_25_01_world.sql
index 8e06833d54d..8e06833d54d 100644
--- a/sql/updates/world/2014_11_25_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_25_01_world.sql
diff --git a/sql/updates/world/2014_11_26_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_26_00_world.sql
index e2aae9d8249..e2aae9d8249 100644
--- a/sql/updates/world/2014_11_26_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_26_00_world.sql
diff --git a/sql/updates/world/2014_11_27_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_27_00_world.sql
index c114aa6e848..c114aa6e848 100644
--- a/sql/updates/world/2014_11_27_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_27_00_world.sql
diff --git a/sql/updates/world/2014_11_27_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_27_01_world.sql
index df6a3f69c5e..df6a3f69c5e 100644
--- a/sql/updates/world/2014_11_27_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_27_01_world.sql
diff --git a/sql/updates/world/2014_11_28_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_28_00_world.sql
index fbcca049d0b..fbcca049d0b 100644
--- a/sql/updates/world/2014_11_28_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_28_00_world.sql
diff --git a/sql/updates/world/2014_11_28_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_28_01_world.sql
index f89267d71b6..f89267d71b6 100644
--- a/sql/updates/world/2014_11_28_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_28_01_world.sql
diff --git a/sql/updates/world/2014_11_29_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_29_00_world.sql
index 066ee2c2610..066ee2c2610 100644
--- a/sql/updates/world/2014_11_29_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_11_29_00_world.sql
diff --git a/sql/updates/world/2014_12_02_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_02_00_world.sql
index 780315fc9d8..780315fc9d8 100644
--- a/sql/updates/world/2014_12_02_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_02_00_world.sql
diff --git a/sql/updates/world/2014_12_03_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_03_00_world.sql
index c6a38c49220..c6a38c49220 100644
--- a/sql/updates/world/2014_12_03_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_03_00_world.sql
diff --git a/sql/updates/world/2014_12_04_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_04_00_world.sql
index 50b5d63d4b6..50b5d63d4b6 100644
--- a/sql/updates/world/2014_12_04_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_04_00_world.sql
diff --git a/sql/updates/world/2014_12_05_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_05_00_world.sql
index 6bce51ddb2b..6bce51ddb2b 100644
--- a/sql/updates/world/2014_12_05_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_05_00_world.sql
diff --git a/sql/updates/world/2014_12_05_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_05_01_world.sql
index 913ae3552a2..913ae3552a2 100644
--- a/sql/updates/world/2014_12_05_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_05_01_world.sql
diff --git a/sql/updates/world/2014_12_09_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_00_world.sql
index 92a6caabb4c..92a6caabb4c 100644
--- a/sql/updates/world/2014_12_09_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_00_world.sql
diff --git a/sql/updates/world/2014_12_09_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_01_world.sql
index 80bb200d19b..80bb200d19b 100644
--- a/sql/updates/world/2014_12_09_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_01_world.sql
diff --git a/sql/updates/world/2014_12_09_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_02_world.sql
index c5e9d832266..c5e9d832266 100644
--- a/sql/updates/world/2014_12_09_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_02_world.sql
diff --git a/sql/updates/world/2014_12_09_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_03_world.sql
index 2d4d7454b09..2d4d7454b09 100644
--- a/sql/updates/world/2014_12_09_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_03_world.sql
diff --git a/sql/updates/world/2014_12_09_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_04_world.sql
index db6fd4dc8c4..db6fd4dc8c4 100644
--- a/sql/updates/world/2014_12_09_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_09_04_world.sql
diff --git a/sql/updates/world/2014_12_11_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_11_00_world.sql
index cf0b3f80eb0..cf0b3f80eb0 100644
--- a/sql/updates/world/2014_12_11_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_11_00_world.sql
diff --git a/sql/updates/world/2014_12_11_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_11_01_world.sql
index 9306d27f68b..9306d27f68b 100644
--- a/sql/updates/world/2014_12_11_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_11_01_world.sql
diff --git a/sql/updates/world/2014_12_12_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_12_00_world.sql
index bf1854689b3..bf1854689b3 100644
--- a/sql/updates/world/2014_12_12_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_12_00_world.sql
diff --git a/sql/updates/world/2014_12_12_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_12_01_world.sql
index 740e6e962aa..740e6e962aa 100644
--- a/sql/updates/world/2014_12_12_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_12_01_world.sql
diff --git a/sql/updates/world/2014_12_13_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_13_00_world.sql
index 3be9f73a293..3be9f73a293 100644
--- a/sql/updates/world/2014_12_13_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_13_00_world.sql
diff --git a/sql/updates/world/2014_12_14_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_14_00_world.sql
index 3d6bf2d473d..3d6bf2d473d 100644
--- a/sql/updates/world/2014_12_14_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_14_00_world.sql
diff --git a/sql/updates/world/2014_12_14_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_14_01_world.sql
index 3a66e2ce72f..3a66e2ce72f 100644
--- a/sql/updates/world/2014_12_14_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_14_01_world.sql
diff --git a/sql/updates/world/2014_12_14_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_14_02_world.sql
index 25f4ed66880..25f4ed66880 100644
--- a/sql/updates/world/2014_12_14_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_14_02_world.sql
diff --git a/sql/updates/world/2014_12_15_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_15_00_world.sql
index 8ed026454c6..8ed026454c6 100644
--- a/sql/updates/world/2014_12_15_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_15_00_world.sql
diff --git a/sql/updates/world/2014_12_16_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_16_00_world.sql
index b67691cee8d..b67691cee8d 100644
--- a/sql/updates/world/2014_12_16_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_16_00_world.sql
diff --git a/sql/updates/world/2014_12_17_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_17_00_world.sql
index fd1e88f9c1a..fd1e88f9c1a 100644
--- a/sql/updates/world/2014_12_17_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_17_00_world.sql
diff --git a/sql/updates/world/2014_12_18_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_18_00_world.sql
index 18ab9f47256..18ab9f47256 100644
--- a/sql/updates/world/2014_12_18_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_18_00_world.sql
diff --git a/sql/updates/world/2014_12_21_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_21_00_world.sql
index 857d7286352..857d7286352 100644
--- a/sql/updates/world/2014_12_21_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_21_00_world.sql
diff --git a/sql/updates/world/2014_12_22_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_22_00_world.sql
index ec1776e5c5b..ec1776e5c5b 100644
--- a/sql/updates/world/2014_12_22_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_22_00_world.sql
diff --git a/sql/updates/world/2014_12_26_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_26_00_world.sql
index 101ed3c08be..101ed3c08be 100644
--- a/sql/updates/world/2014_12_26_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_26_00_world.sql
diff --git a/sql/updates/world/2014_12_26_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_26_01_world.sql
index 90ee138a237..90ee138a237 100644
--- a/sql/updates/world/2014_12_26_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_26_01_world.sql
diff --git a/sql/updates/world/2014_12_27_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_00_world.sql
index d1273193738..d1273193738 100644
--- a/sql/updates/world/2014_12_27_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_00_world.sql
diff --git a/sql/updates/world/2014_12_27_01_world_335.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_01_world_335.sql
index 961e9a0523d..961e9a0523d 100644
--- a/sql/updates/world/2014_12_27_01_world_335.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_01_world_335.sql
diff --git a/sql/updates/world/2014_12_27_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_02_world.sql
index 3ce1d97df0e..3ce1d97df0e 100644
--- a/sql/updates/world/2014_12_27_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_02_world.sql
diff --git a/sql/updates/world/2014_12_27_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_03_world.sql
index ba883f29e66..ba883f29e66 100644
--- a/sql/updates/world/2014_12_27_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_03_world.sql
diff --git a/sql/updates/world/2014_12_27_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_04_world.sql
index 3ca4f69f591..3ca4f69f591 100644
--- a/sql/updates/world/2014_12_27_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_04_world.sql
diff --git a/sql/updates/world/2014_12_27_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_05_world.sql
index 01743ff30c3..01743ff30c3 100644
--- a/sql/updates/world/2014_12_27_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_05_world.sql
diff --git a/sql/updates/world/2014_12_27_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_06_world.sql
index bc19a755a9b..bc19a755a9b 100644
--- a/sql/updates/world/2014_12_27_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_06_world.sql
diff --git a/sql/updates/world/2014_12_27_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_07_world.sql
index 78d9ee848a5..78d9ee848a5 100644
--- a/sql/updates/world/2014_12_27_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_07_world.sql
diff --git a/sql/updates/world/2014_12_27_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_08_world.sql
index ac4a228c154..ac4a228c154 100644
--- a/sql/updates/world/2014_12_27_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_08_world.sql
diff --git a/sql/updates/world/2014_12_27_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_09_world.sql
index 89371fff954..89371fff954 100644
--- a/sql/updates/world/2014_12_27_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_09_world.sql
diff --git a/sql/updates/world/2014_12_27_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_10_world.sql
index 590be4a9adc..590be4a9adc 100644
--- a/sql/updates/world/2014_12_27_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_10_world.sql
diff --git a/sql/updates/world/2014_12_27_11_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_11_world.sql
index 8474f056f5e..8474f056f5e 100644
--- a/sql/updates/world/2014_12_27_11_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_11_world.sql
diff --git a/sql/updates/world/2014_12_27_12_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_12_world.sql
index acc0a8fb619..acc0a8fb619 100644
--- a/sql/updates/world/2014_12_27_12_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_27_12_world.sql
diff --git a/sql/updates/world/2014_12_28_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_00_world.sql
index 467115a2de2..467115a2de2 100644
--- a/sql/updates/world/2014_12_28_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_00_world.sql
diff --git a/sql/updates/world/2014_12_28_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_01_world.sql
index e580a29f1f0..e580a29f1f0 100644
--- a/sql/updates/world/2014_12_28_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_01_world.sql
diff --git a/sql/updates/world/2014_12_28_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_02_world.sql
index bc44ddd1cd1..bc44ddd1cd1 100644
--- a/sql/updates/world/2014_12_28_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_02_world.sql
diff --git a/sql/updates/world/2014_12_28_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_03_world.sql
index fe3b786b23a..fe3b786b23a 100644
--- a/sql/updates/world/2014_12_28_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_03_world.sql
diff --git a/sql/updates/world/2014_12_28_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_04_world.sql
index 8a1b29a8169..8a1b29a8169 100644
--- a/sql/updates/world/2014_12_28_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_04_world.sql
diff --git a/sql/updates/world/2014_12_28_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_05_world.sql
index f3fd0021214..f3fd0021214 100644
--- a/sql/updates/world/2014_12_28_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_28_05_world.sql
diff --git a/sql/updates/world/2014_12_29_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_29_00_world.sql
index f58c76137b1..f58c76137b1 100644
--- a/sql/updates/world/2014_12_29_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_29_00_world.sql
diff --git a/sql/updates/world/2014_12_29_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_29_01_world.sql
index 06af046dc68..06af046dc68 100644
--- a/sql/updates/world/2014_12_29_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_29_01_world.sql
diff --git a/sql/updates/world/2014_12_29_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_29_02_world.sql
index 2872d26acd1..2872d26acd1 100644
--- a/sql/updates/world/2014_12_29_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_29_02_world.sql
diff --git a/sql/updates/world/2014_12_30_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_30_00_world.sql
index c977412e5d3..c977412e5d3 100644
--- a/sql/updates/world/2014_12_30_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_30_00_world.sql
diff --git a/sql/updates/world/2014_12_30_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_30_01_world.sql
index 51c93e32be9..51c93e32be9 100644
--- a/sql/updates/world/2014_12_30_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_30_01_world.sql
diff --git a/sql/updates/world/2014_12_31_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_31_00_world.sql
index 62d9c4e8f94..62d9c4e8f94 100644
--- a/sql/updates/world/2014_12_31_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2014_12_31_00_world.sql
diff --git a/sql/updates/world/2015_01_01_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_01_00_world.sql
index 3d78439fed5..3d78439fed5 100644
--- a/sql/updates/world/2015_01_01_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_01_00_world.sql
diff --git a/sql/updates/world/2015_01_07_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_07_00_world.sql
index 3cf6056964d..3cf6056964d 100644
--- a/sql/updates/world/2015_01_07_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_07_00_world.sql
diff --git a/sql/updates/world/2015_01_08_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_08_00_world.sql
index 7d5a19751e3..7d5a19751e3 100644
--- a/sql/updates/world/2015_01_08_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_08_00_world.sql
diff --git a/sql/updates/world/2015_01_09_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_09_00_world.sql
index 861584cab4d..861584cab4d 100644
--- a/sql/updates/world/2015_01_09_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_09_00_world.sql
diff --git a/sql/updates/world/2015_01_09_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_09_01_world.sql
index d07bd8b4162..6c7f42580d3 100644
--- a/sql/updates/world/2015_01_09_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_09_01_world.sql
@@ -1,5 +1,5 @@
--- Replace the previously spawned chests with sniffed ones

-DELETE FROM `gameobject` WHERE `id` IN (185168, 185169) AND `guid` IN (20499, 20496);

-INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES

-(20496, 185168, 543, 3, 1, -1429.81, 1772.916, 82.0765, 5.044002, 0, 0, 0, 1, 7200, 255, 1, 19243), -- 185168 (Area: 3562)

-(20499, 185169, 543, 3, 1, -1429.81, 1772.916, 82.0765, 5.044002, 0, 0, 0, 1, 7200, 255, 1, 19243); -- 185169 (Area: 3562)

+-- Replace the previously spawned chests with sniffed ones
+DELETE FROM `gameobject` WHERE `id` IN (185168, 185169) AND `guid` IN (20499, 20496);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(20496, 185168, 543, 3, 1, -1429.81, 1772.916, 82.0765, 5.044002, 0, 0, 0, 1, 7200, 255, 1, 19243), -- 185168 (Area: 3562)
+(20499, 185169, 543, 3, 1, -1429.81, 1772.916, 82.0765, 5.044002, 0, 0, 0, 1, 7200, 255, 1, 19243); -- 185169 (Area: 3562)
diff --git a/sql/updates/world/2015_01_11_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_11_00_world.sql
index 8fa014fa744..8fa014fa744 100644
--- a/sql/updates/world/2015_01_11_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_11_00_world.sql
diff --git a/sql/updates/world/2015_01_11_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_11_01_world.sql
index dca46b515bc..dca46b515bc 100644
--- a/sql/updates/world/2015_01_11_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_11_01_world.sql
diff --git a/sql/updates/world/2015_01_12_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_12_00_world.sql
index deaff903974..deaff903974 100644
--- a/sql/updates/world/2015_01_12_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_12_00_world.sql
diff --git a/sql/updates/world/2015_01_12_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_12_01_world.sql
index c5513f01c1d..c5513f01c1d 100644
--- a/sql/updates/world/2015_01_12_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_12_01_world.sql
diff --git a/sql/updates/world/2015_01_12_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_12_02_world.sql
index 154c6e2596a..154c6e2596a 100644
--- a/sql/updates/world/2015_01_12_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_12_02_world.sql
diff --git a/sql/updates/world/2015_01_16_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_16_00_world.sql
index 3488d508a2f..3488d508a2f 100644
--- a/sql/updates/world/2015_01_16_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_16_00_world.sql
diff --git a/sql/updates/world/2015_01_17_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_17_00_world.sql
index 0509dba10f2..0509dba10f2 100644
--- a/sql/updates/world/2015_01_17_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_17_00_world.sql
diff --git a/sql/updates/world/2015_01_18_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_18_00_world.sql
index 0a9e3e38aad..fe054c39cda 100644
--- a/sql/updates/world/2015_01_18_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_18_00_world.sql
@@ -1,3 +1,3 @@
---

-UPDATE `gameobject` SET `spawnMask` = 1 WHERE `guid` = 20496 AND `id` = 185168;

-UPDATE `gameobject` SET `spawnMask` = 2 WHERE `guid` = 20499 AND `id` = 185169; 

+--
+UPDATE `gameobject` SET `spawnMask` = 1 WHERE `guid` = 20496 AND `id` = 185168;
+UPDATE `gameobject` SET `spawnMask` = 2 WHERE `guid` = 20499 AND `id` = 185169; 
diff --git a/sql/updates/world/2015_01_21_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_21_00_world.sql
index 2a63274ce1e..2a63274ce1e 100644
--- a/sql/updates/world/2015_01_21_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_21_00_world.sql
diff --git a/sql/updates/world/2015_01_22_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_22_00_world.sql
index 6392ea2abe6..6392ea2abe6 100644
--- a/sql/updates/world/2015_01_22_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_22_00_world.sql
diff --git a/sql/updates/world/2015_01_25_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_25_00_world.sql
index d089fff4cc5..d089fff4cc5 100644
--- a/sql/updates/world/2015_01_25_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_25_00_world.sql
diff --git a/sql/updates/world/2015_01_27_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_27_00_world.sql
index 5b964110846..5b964110846 100644
--- a/sql/updates/world/2015_01_27_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_27_00_world.sql
diff --git a/sql/updates/world/2015_01_30_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_30_00_world.sql
index 4393b38ddd2..4393b38ddd2 100644
--- a/sql/updates/world/2015_01_30_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_30_00_world.sql
diff --git a/sql/updates/world/2015_01_31_00_335.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_31_00_335.sql
index 8aaa026154a..8aaa026154a 100644
--- a/sql/updates/world/2015_01_31_00_335.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_01_31_00_335.sql
diff --git a/sql/updates/world/2015_02_02_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_02_00_world.sql
index 84d31ef7be1..84d31ef7be1 100644
--- a/sql/updates/world/2015_02_02_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_02_00_world.sql
diff --git a/sql/updates/world/2015_02_05_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_05_00_world.sql
index 77bc4fd8b53..77bc4fd8b53 100644
--- a/sql/updates/world/2015_02_05_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_05_00_world.sql
diff --git a/sql/updates/world/2015_02_06_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_00_world.sql
index 96eb6a65f28..96eb6a65f28 100644
--- a/sql/updates/world/2015_02_06_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_00_world.sql
diff --git a/sql/updates/world/2015_02_06_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_01_world.sql
index 3b16d7a367c..3b16d7a367c 100644
--- a/sql/updates/world/2015_02_06_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_01_world.sql
diff --git a/sql/updates/world/2015_02_06_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_02_world.sql
index 4c514ea95d4..4c514ea95d4 100644
--- a/sql/updates/world/2015_02_06_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_02_world.sql
diff --git a/sql/updates/world/2015_02_06_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_03_world.sql
index 83aedd75069..83aedd75069 100644
--- a/sql/updates/world/2015_02_06_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_03_world.sql
diff --git a/sql/updates/world/2015_02_06_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_04_world.sql
index 1a4484df5a3..1a4484df5a3 100644
--- a/sql/updates/world/2015_02_06_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_04_world.sql
diff --git a/sql/updates/world/2015_02_06_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_05_world.sql
index bd04efd9c66..bd04efd9c66 100644
--- a/sql/updates/world/2015_02_06_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_05_world.sql
diff --git a/sql/updates/world/2015_02_06_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_06_world.sql
index 0d7b75a72cc..0d7b75a72cc 100644
--- a/sql/updates/world/2015_02_06_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_06_world.sql
diff --git a/sql/updates/world/2015_02_06_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_07_world.sql
index ab3eb6ae454..ab3eb6ae454 100644
--- a/sql/updates/world/2015_02_06_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_07_world.sql
diff --git a/sql/updates/world/2015_02_06_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_08_world.sql
index e05c5e15c8e..e05c5e15c8e 100644
--- a/sql/updates/world/2015_02_06_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_08_world.sql
diff --git a/sql/updates/world/2015_02_06_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_09_world.sql
index 94696444dd4..94696444dd4 100644
--- a/sql/updates/world/2015_02_06_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_09_world.sql
diff --git a/sql/updates/world/2015_02_06_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_10_world.sql
index 428a0c7e8ca..428a0c7e8ca 100644
--- a/sql/updates/world/2015_02_06_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_10_world.sql
diff --git a/sql/updates/world/2015_02_06_11_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_11_world.sql
index 5a385218931..5a385218931 100644
--- a/sql/updates/world/2015_02_06_11_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_11_world.sql
diff --git a/sql/updates/world/2015_02_06_12_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_12_world.sql
index f6a95a7c010..f6a95a7c010 100644
--- a/sql/updates/world/2015_02_06_12_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_12_world.sql
diff --git a/sql/updates/world/2015_02_06_13_world_335.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_13_world_335.sql
index 8cd8df2147e..8cd8df2147e 100644
--- a/sql/updates/world/2015_02_06_13_world_335.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_06_13_world_335.sql
diff --git a/sql/updates/world/2015_02_07_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_07_00_world.sql
index c0616f833ea..c0616f833ea 100644
--- a/sql/updates/world/2015_02_07_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_07_00_world.sql
diff --git a/sql/updates/world/2015_02_07_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_07_01_world.sql
index 742d833352e..742d833352e 100644
--- a/sql/updates/world/2015_02_07_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_07_01_world.sql
diff --git a/sql/updates/world/2015_02_09_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_00_world.sql
index dcfd5ddf029..dcfd5ddf029 100644
--- a/sql/updates/world/2015_02_09_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_00_world.sql
diff --git a/sql/updates/world/2015_02_09_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_01_world.sql
index f844fcce5d0..f844fcce5d0 100644
--- a/sql/updates/world/2015_02_09_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_01_world.sql
diff --git a/sql/updates/world/2015_02_09_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_02_world.sql
index 46ff767997f..46ff767997f 100644
--- a/sql/updates/world/2015_02_09_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_02_world.sql
diff --git a/sql/updates/world/2015_02_09_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_03_world.sql
index 2bef0c6b1f5..2bef0c6b1f5 100644
--- a/sql/updates/world/2015_02_09_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_03_world.sql
diff --git a/sql/updates/world/2015_02_09_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_04_world.sql
index 7ad7c3411af..7ad7c3411af 100644
--- a/sql/updates/world/2015_02_09_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_04_world.sql
diff --git a/sql/updates/world/2015_02_09_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_05_world.sql
index 2486927a2cf..2486927a2cf 100644
--- a/sql/updates/world/2015_02_09_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_05_world.sql
diff --git a/sql/updates/world/2015_02_09_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_06_world.sql
index f4dd026d790..f4dd026d790 100644
--- a/sql/updates/world/2015_02_09_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_06_world.sql
diff --git a/sql/updates/world/2015_02_09_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_07_world.sql
index 89c125a9c2e..89c125a9c2e 100644
--- a/sql/updates/world/2015_02_09_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_07_world.sql
diff --git a/sql/updates/world/2015_02_09_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_08_world.sql
index 4699da2c181..4699da2c181 100644
--- a/sql/updates/world/2015_02_09_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_08_world.sql
diff --git a/sql/updates/world/2015_02_09_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_09_world.sql
index ef2b8bb9b1d..ef2b8bb9b1d 100644
--- a/sql/updates/world/2015_02_09_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_09_world.sql
diff --git a/sql/updates/world/2015_02_09_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_10_world.sql
index 67fd1112e47..67fd1112e47 100644
--- a/sql/updates/world/2015_02_09_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_10_world.sql
diff --git a/sql/updates/world/2015_02_09_11_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_11_world.sql
index d0838a1b31d..d0838a1b31d 100644
--- a/sql/updates/world/2015_02_09_11_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_11_world.sql
diff --git a/sql/updates/world/2015_02_09_12_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_12_world.sql
index 0306b11fa79..0306b11fa79 100644
--- a/sql/updates/world/2015_02_09_12_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_12_world.sql
diff --git a/sql/updates/world/2015_02_09_13_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_13_world.sql
index 96d4237bd0d..96d4237bd0d 100644
--- a/sql/updates/world/2015_02_09_13_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_13_world.sql
diff --git a/sql/updates/world/2015_02_09_14_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_14_world.sql
index 4a2d1bba7df..4a2d1bba7df 100644
--- a/sql/updates/world/2015_02_09_14_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_14_world.sql
diff --git a/sql/updates/world/2015_02_09_15_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_15_world.sql
index d2495cf0270..d2495cf0270 100644
--- a/sql/updates/world/2015_02_09_15_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_09_15_world.sql
diff --git a/sql/updates/world/2015_02_10_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_00_world.sql
index bfa25d8982b..bfa25d8982b 100644
--- a/sql/updates/world/2015_02_10_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_00_world.sql
diff --git a/sql/updates/world/2015_02_10_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_01_world.sql
index 835ac05343b..835ac05343b 100644
--- a/sql/updates/world/2015_02_10_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_01_world.sql
diff --git a/sql/updates/world/2015_02_10_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_02_world.sql
index 62c0f960123..62c0f960123 100644
--- a/sql/updates/world/2015_02_10_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_02_world.sql
diff --git a/sql/updates/world/2015_02_10_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_03_world.sql
index 6b2ed183c1d..6b2ed183c1d 100644
--- a/sql/updates/world/2015_02_10_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_03_world.sql
diff --git a/sql/updates/world/2015_02_10_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_04_world.sql
index 27debf9fb46..27debf9fb46 100644
--- a/sql/updates/world/2015_02_10_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_04_world.sql
diff --git a/sql/updates/world/2015_02_10_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_05_world.sql
index 20c36c24585..20c36c24585 100644
--- a/sql/updates/world/2015_02_10_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_05_world.sql
diff --git a/sql/updates/world/2015_02_10_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_06_world.sql
index bcd42994ee2..bcd42994ee2 100644
--- a/sql/updates/world/2015_02_10_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_06_world.sql
diff --git a/sql/updates/world/2015_02_10_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_07_world.sql
index 87a59e4440e..87a59e4440e 100644
--- a/sql/updates/world/2015_02_10_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_07_world.sql
diff --git a/sql/updates/world/2015_02_10_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_08_world.sql
index 647e89253f5..647e89253f5 100644
--- a/sql/updates/world/2015_02_10_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_08_world.sql
diff --git a/sql/updates/world/2015_02_10_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_09_world.sql
index 9ba05c77e41..9ba05c77e41 100644
--- a/sql/updates/world/2015_02_10_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_10_09_world.sql
diff --git a/sql/updates/world/2015_02_11_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_00_world.sql
index 271a5b8be94..271a5b8be94 100644
--- a/sql/updates/world/2015_02_11_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_00_world.sql
diff --git a/sql/updates/world/2015_02_11_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_01_world.sql
index 5932d48ef5e..5932d48ef5e 100644
--- a/sql/updates/world/2015_02_11_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_01_world.sql
diff --git a/sql/updates/world/2015_02_11_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_02_world.sql
index 8db79bc0c8f..8db79bc0c8f 100644
--- a/sql/updates/world/2015_02_11_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_02_world.sql
diff --git a/sql/updates/world/2015_02_11_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_03_world.sql
index d748355d624..d748355d624 100644
--- a/sql/updates/world/2015_02_11_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_03_world.sql
diff --git a/sql/updates/world/2015_02_11_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_04_world.sql
index f94edb80882..f94edb80882 100644
--- a/sql/updates/world/2015_02_11_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_04_world.sql
diff --git a/sql/updates/world/2015_02_11_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_05_world.sql
index 3f0d52d3054..3f0d52d3054 100644
--- a/sql/updates/world/2015_02_11_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_11_05_world.sql
diff --git a/sql/updates/world/2015_02_12_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_00_world.sql
index ee05a6eb020..ee05a6eb020 100644
--- a/sql/updates/world/2015_02_12_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_00_world.sql
diff --git a/sql/updates/world/2015_02_12_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_01_world.sql
index 8ce5742c7a3..8ce5742c7a3 100644
--- a/sql/updates/world/2015_02_12_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_01_world.sql
diff --git a/sql/updates/world/2015_02_12_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_02_world.sql
index 8b9ed71efea..8b9ed71efea 100644
--- a/sql/updates/world/2015_02_12_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_02_world.sql
diff --git a/sql/updates/world/2015_02_12_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_03_world.sql
index e8759e9037a..e8759e9037a 100644
--- a/sql/updates/world/2015_02_12_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_03_world.sql
diff --git a/sql/updates/world/2015_02_12_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_04_world.sql
index d841e98f914..d841e98f914 100644
--- a/sql/updates/world/2015_02_12_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_04_world.sql
diff --git a/sql/updates/world/2015_02_12_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_05_world.sql
index 1d7d3bb3cf7..1d7d3bb3cf7 100644
--- a/sql/updates/world/2015_02_12_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_05_world.sql
diff --git a/sql/updates/world/2015_02_12_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_06_world.sql
index d6eaf64d14e..d6eaf64d14e 100644
--- a/sql/updates/world/2015_02_12_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_06_world.sql
diff --git a/sql/updates/world/2015_02_12_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_07_world.sql
index 7fc438ed015..7fc438ed015 100644
--- a/sql/updates/world/2015_02_12_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_07_world.sql
diff --git a/sql/updates/world/2015_02_12_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_08_world.sql
index 70c51199c8c..70c51199c8c 100644
--- a/sql/updates/world/2015_02_12_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_08_world.sql
diff --git a/sql/updates/world/2015_02_12_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_09_world.sql
index 36c11d35ee8..36c11d35ee8 100644
--- a/sql/updates/world/2015_02_12_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_09_world.sql
diff --git a/sql/updates/world/2015_02_12_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_10_world.sql
index cb8f0e95b39..cb8f0e95b39 100644
--- a/sql/updates/world/2015_02_12_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_12_10_world.sql
diff --git a/sql/updates/world/2015_02_13_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_00_world.sql
index c36958c180d..c36958c180d 100644
--- a/sql/updates/world/2015_02_13_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_00_world.sql
diff --git a/sql/updates/world/2015_02_13_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_01_world.sql
index 03b117efc12..03b117efc12 100644
--- a/sql/updates/world/2015_02_13_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_01_world.sql
diff --git a/sql/updates/world/2015_02_13_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_02_world.sql
index 1780a238dca..1780a238dca 100644
--- a/sql/updates/world/2015_02_13_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_02_world.sql
diff --git a/sql/updates/world/2015_02_13_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_03_world.sql
index 0b0548c3f78..0b0548c3f78 100644
--- a/sql/updates/world/2015_02_13_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_03_world.sql
diff --git a/sql/updates/world/2015_02_13_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_04_world.sql
index 96db7cbf845..96db7cbf845 100644
--- a/sql/updates/world/2015_02_13_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_04_world.sql
diff --git a/sql/updates/world/2015_02_13_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_05_world.sql
index ca9b648d5eb..ca9b648d5eb 100644
--- a/sql/updates/world/2015_02_13_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_05_world.sql
diff --git a/sql/updates/world/2015_02_13_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_06_world.sql
index 8cc87843ad1..8cc87843ad1 100644
--- a/sql/updates/world/2015_02_13_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_06_world.sql
diff --git a/sql/updates/world/2015_02_13_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_07_world.sql
index a46884162f4..a46884162f4 100644
--- a/sql/updates/world/2015_02_13_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_07_world.sql
diff --git a/sql/updates/world/2015_02_13_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_08_world.sql
index 7043a9cdff8..7043a9cdff8 100644
--- a/sql/updates/world/2015_02_13_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_08_world.sql
diff --git a/sql/updates/world/2015_02_13_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_09_world.sql
index 7ed85568830..7ed85568830 100644
--- a/sql/updates/world/2015_02_13_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_13_09_world.sql
diff --git a/sql/updates/world/2015_02_14_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_00_world.sql
index 727aaf91e6f..727aaf91e6f 100644
--- a/sql/updates/world/2015_02_14_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_00_world.sql
diff --git a/sql/updates/world/2015_02_14_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_01_world.sql
index 460f6b1a76f..460f6b1a76f 100644
--- a/sql/updates/world/2015_02_14_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_01_world.sql
diff --git a/sql/updates/world/2015_02_14_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_02_world.sql
index 1978c7ff184..1978c7ff184 100644
--- a/sql/updates/world/2015_02_14_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_02_world.sql
diff --git a/sql/updates/world/2015_02_14_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_03_world.sql
index e4add1c22bf..e4add1c22bf 100644
--- a/sql/updates/world/2015_02_14_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_03_world.sql
diff --git a/sql/updates/world/2015_02_14_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_04_world.sql
index be552ca6125..be552ca6125 100644
--- a/sql/updates/world/2015_02_14_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_04_world.sql
diff --git a/sql/updates/world/2015_02_14_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_05_world.sql
index bb81873bf4b..bb81873bf4b 100644
--- a/sql/updates/world/2015_02_14_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_14_05_world.sql
diff --git a/sql/updates/world/2015_02_15_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_00_world.sql
index ba302a01484..ba302a01484 100644
--- a/sql/updates/world/2015_02_15_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_00_world.sql
diff --git a/sql/updates/world/2015_02_15_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_01_world.sql
index 63deab73f54..63deab73f54 100644
--- a/sql/updates/world/2015_02_15_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_01_world.sql
diff --git a/sql/updates/world/2015_02_15_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_02_world.sql
index 34a27d468b7..34a27d468b7 100644
--- a/sql/updates/world/2015_02_15_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_02_world.sql
diff --git a/sql/updates/world/2015_02_15_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_03_world.sql
index 64e7fe6c50a..64e7fe6c50a 100644
--- a/sql/updates/world/2015_02_15_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_03_world.sql
diff --git a/sql/updates/world/2015_02_15_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_04_world.sql
index 56212e2873c..56212e2873c 100644
--- a/sql/updates/world/2015_02_15_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_04_world.sql
diff --git a/sql/updates/world/2015_02_15_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_05_world.sql
index 033d6f1d4b6..033d6f1d4b6 100644
--- a/sql/updates/world/2015_02_15_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_05_world.sql
diff --git a/sql/updates/world/2015_02_15_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_06_world.sql
index 84d6730666f..84d6730666f 100644
--- a/sql/updates/world/2015_02_15_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_06_world.sql
diff --git a/sql/updates/world/2015_02_15_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_07_world.sql
index afbbc3817ef..afbbc3817ef 100644
--- a/sql/updates/world/2015_02_15_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_07_world.sql
diff --git a/sql/updates/world/2015_02_15_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_08_world.sql
index db2f5e1b59a..db2f5e1b59a 100644
--- a/sql/updates/world/2015_02_15_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_08_world.sql
diff --git a/sql/updates/world/2015_02_15_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_09_world.sql
index 1e2ca3b9f1c..1e2ca3b9f1c 100644
--- a/sql/updates/world/2015_02_15_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_09_world.sql
diff --git a/sql/updates/world/2015_02_15_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_10_world.sql
index d9506211550..d9506211550 100644
--- a/sql/updates/world/2015_02_15_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_10_world.sql
diff --git a/sql/updates/world/2015_02_15_11_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_11_world.sql
index 458a23a77cf..458a23a77cf 100644
--- a/sql/updates/world/2015_02_15_11_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_11_world.sql
diff --git a/sql/updates/world/2015_02_15_12_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_12_world.sql
index cb4c2b9150c..cb4c2b9150c 100644
--- a/sql/updates/world/2015_02_15_12_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_12_world.sql
diff --git a/sql/updates/world/2015_02_15_13_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_13_world.sql
index 8e1b4629085..8e1b4629085 100644
--- a/sql/updates/world/2015_02_15_13_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_13_world.sql
diff --git a/sql/updates/world/2015_02_15_14_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_14_world.sql
index 7e387b9df5a..7e387b9df5a 100644
--- a/sql/updates/world/2015_02_15_14_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_15_14_world.sql
diff --git a/sql/updates/world/2015_02_16_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_00_world.sql
index f6ea0ed5a0e..f6ea0ed5a0e 100644
--- a/sql/updates/world/2015_02_16_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_00_world.sql
diff --git a/sql/updates/world/2015_02_16_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_01_world.sql
index 0d130f32f7b..0d130f32f7b 100644
--- a/sql/updates/world/2015_02_16_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_01_world.sql
diff --git a/sql/updates/world/2015_02_16_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_02_world.sql
index 3f67ae7ac1b..3f67ae7ac1b 100644
--- a/sql/updates/world/2015_02_16_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_02_world.sql
diff --git a/sql/updates/world/2015_02_16_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_03_world.sql
index 35f17a761cd..35f17a761cd 100644
--- a/sql/updates/world/2015_02_16_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_03_world.sql
diff --git a/sql/updates/world/2015_02_16_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_04_world.sql
index b358aad4eb2..b358aad4eb2 100644
--- a/sql/updates/world/2015_02_16_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_04_world.sql
diff --git a/sql/updates/world/2015_02_16_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_05_world.sql
index beb4e14f3af..beb4e14f3af 100644
--- a/sql/updates/world/2015_02_16_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_05_world.sql
diff --git a/sql/updates/world/2015_02_16_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_06_world.sql
index b8f7294216d..b8f7294216d 100644
--- a/sql/updates/world/2015_02_16_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_16_06_world.sql
diff --git a/sql/updates/world/2015_02_17_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_00_world.sql
index 11f5eca484e..11f5eca484e 100644
--- a/sql/updates/world/2015_02_17_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_00_world.sql
diff --git a/sql/updates/world/2015_02_17_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_01_world.sql
index bcd15597b70..bcd15597b70 100644
--- a/sql/updates/world/2015_02_17_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_01_world.sql
diff --git a/sql/updates/world/2015_02_17_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_02_world.sql
index 4bbcde642e7..4bbcde642e7 100644
--- a/sql/updates/world/2015_02_17_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_02_world.sql
diff --git a/sql/updates/world/2015_02_17_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_03_world.sql
index 5ef13948b75..5ef13948b75 100644
--- a/sql/updates/world/2015_02_17_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_03_world.sql
diff --git a/sql/updates/world/2015_02_17_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_04_world.sql
index 68c1268eec2..68c1268eec2 100644
--- a/sql/updates/world/2015_02_17_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_04_world.sql
diff --git a/sql/updates/world/2015_02_17_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_05_world.sql
index 807f4f81a5d..807f4f81a5d 100644
--- a/sql/updates/world/2015_02_17_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_17_05_world.sql
diff --git a/sql/updates/world/2015_02_18_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_00_world.sql
index edf6aae06f0..edf6aae06f0 100644
--- a/sql/updates/world/2015_02_18_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_00_world.sql
diff --git a/sql/updates/world/2015_02_18_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_01_world.sql
index 5c6c879a83a..5c6c879a83a 100644
--- a/sql/updates/world/2015_02_18_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_01_world.sql
diff --git a/sql/updates/world/2015_02_18_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_02_world.sql
index 66d7951d719..66d7951d719 100644
--- a/sql/updates/world/2015_02_18_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_02_world.sql
diff --git a/sql/updates/world/2015_02_18_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_03_world.sql
index 6a4c12347a3..6a4c12347a3 100644
--- a/sql/updates/world/2015_02_18_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_18_03_world.sql
diff --git a/sql/updates/world/2015_02_19_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_19_00_world.sql
index d0411d68c66..d0411d68c66 100644
--- a/sql/updates/world/2015_02_19_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_19_00_world.sql
diff --git a/sql/updates/world/2015_02_20_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_00_world.sql
index 918ed39cba1..918ed39cba1 100644
--- a/sql/updates/world/2015_02_20_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_00_world.sql
diff --git a/sql/updates/world/2015_02_20_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_01_world.sql
index b4702d55177..b4702d55177 100644
--- a/sql/updates/world/2015_02_20_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_01_world.sql
diff --git a/sql/updates/world/2015_02_20_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_02_world.sql
index 2fc118ac1f3..2fc118ac1f3 100644
--- a/sql/updates/world/2015_02_20_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_02_world.sql
diff --git a/sql/updates/world/2015_02_20_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_03_world.sql
index 225719a435d..225719a435d 100644
--- a/sql/updates/world/2015_02_20_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_03_world.sql
diff --git a/sql/updates/world/2015_02_20_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_04_world.sql
index 1560b983859..1560b983859 100644
--- a/sql/updates/world/2015_02_20_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_20_04_world.sql
diff --git a/sql/updates/world/2015_02_21_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_21_00_world.sql
index 7e71235703c..7e71235703c 100644
--- a/sql/updates/world/2015_02_21_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_21_00_world.sql
diff --git a/sql/updates/world/2015_02_22_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_22_00_world.sql
index fef42379e0b..fef42379e0b 100644
--- a/sql/updates/world/2015_02_22_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_22_00_world.sql
diff --git a/sql/updates/world/2015_02_23_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_00_world.sql
index c84da7b2c84..c84da7b2c84 100644
--- a/sql/updates/world/2015_02_23_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_00_world.sql
diff --git a/sql/updates/world/2015_02_23_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_01_world.sql
index e475f2f2f6b..e475f2f2f6b 100644
--- a/sql/updates/world/2015_02_23_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_01_world.sql
diff --git a/sql/updates/world/2015_02_23_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_02_world.sql
index 51d998b98b4..51d998b98b4 100644
--- a/sql/updates/world/2015_02_23_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_02_world.sql
diff --git a/sql/updates/world/2015_02_23_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_03_world.sql
index 468af7088b4..468af7088b4 100644
--- a/sql/updates/world/2015_02_23_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_03_world.sql
diff --git a/sql/updates/world/2015_02_23_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_04_world.sql
index b4e68f47825..b4e68f47825 100644
--- a/sql/updates/world/2015_02_23_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_04_world.sql
diff --git a/sql/updates/world/2015_02_23_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_05_world.sql
index 41b0a9f120d..41b0a9f120d 100644
--- a/sql/updates/world/2015_02_23_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_05_world.sql
diff --git a/sql/updates/world/2015_02_23_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_06_world.sql
index 7bb0e20cc14..7bb0e20cc14 100644
--- a/sql/updates/world/2015_02_23_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_06_world.sql
diff --git a/sql/updates/world/2015_02_23_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_07_world.sql
index 01ab70e6981..01ab70e6981 100644
--- a/sql/updates/world/2015_02_23_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_07_world.sql
diff --git a/sql/updates/world/2015_02_23_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_08_world.sql
index 28f50fde9dd..28f50fde9dd 100644
--- a/sql/updates/world/2015_02_23_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_08_world.sql
diff --git a/sql/updates/world/2015_02_23_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_09_world.sql
index f96d3d42a1b..f96d3d42a1b 100644
--- a/sql/updates/world/2015_02_23_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_09_world.sql
diff --git a/sql/updates/world/2015_02_23_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_10_world.sql
index e5b7bf5242d..e5b7bf5242d 100644
--- a/sql/updates/world/2015_02_23_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_23_10_world.sql
diff --git a/sql/updates/world/2015_02_24_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_24_00_world.sql
index e0b1a44286e..e0b1a44286e 100644
--- a/sql/updates/world/2015_02_24_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_24_00_world.sql
diff --git a/sql/updates/world/2015_02_24_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_24_01_world.sql
index 3db370ac965..3db370ac965 100644
--- a/sql/updates/world/2015_02_24_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_24_01_world.sql
diff --git a/sql/updates/world/2015_02_25_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_25_00_world.sql
index 0d72b108502..0d72b108502 100644
--- a/sql/updates/world/2015_02_25_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_25_00_world.sql
diff --git a/sql/updates/world/2015_02_27_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_27_00_world.sql
index 92d1bd55c8a..92d1bd55c8a 100644
--- a/sql/updates/world/2015_02_27_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_27_00_world.sql
diff --git a/sql/updates/world/2015_02_27_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_27_01_world.sql
index 30f02d9900e..30f02d9900e 100644
--- a/sql/updates/world/2015_02_27_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_27_01_world.sql
diff --git a/sql/updates/world/2015_02_27_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_27_02_world.sql
index 1298bc54674..1298bc54674 100644
--- a/sql/updates/world/2015_02_27_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_02_27_02_world.sql
diff --git a/sql/updates/world/2015_03_01_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_01_00_world.sql
index 5fa2dc8de28..5fa2dc8de28 100644
--- a/sql/updates/world/2015_03_01_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_01_00_world.sql
diff --git a/sql/updates/world/2015_03_02_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_00_world.sql
index a76b40e2212..a76b40e2212 100644
--- a/sql/updates/world/2015_03_02_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_00_world.sql
diff --git a/sql/updates/world/2015_03_02_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_01_world.sql
index 45c43161ac9..45c43161ac9 100644
--- a/sql/updates/world/2015_03_02_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_01_world.sql
diff --git a/sql/updates/world/2015_03_02_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_02_world.sql
index 99f00a1be47..99f00a1be47 100644
--- a/sql/updates/world/2015_03_02_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_02_world.sql
diff --git a/sql/updates/world/2015_03_02_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_03_world.sql
index 00240288b25..00240288b25 100644
--- a/sql/updates/world/2015_03_02_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_03_world.sql
diff --git a/sql/updates/world/2015_03_02_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_04_world.sql
index 557d6cb6792..557d6cb6792 100644
--- a/sql/updates/world/2015_03_02_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_04_world.sql
diff --git a/sql/updates/world/2015_03_02_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_05_world.sql
index 31eca7f0310..31eca7f0310 100644
--- a/sql/updates/world/2015_03_02_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_05_world.sql
diff --git a/sql/updates/world/2015_03_02_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_06_world.sql
index 585c6482366..585c6482366 100644
--- a/sql/updates/world/2015_03_02_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_02_06_world.sql
diff --git a/sql/updates/world/2015_03_07_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_00_world.sql
index 4cc5d647e1a..4cc5d647e1a 100644
--- a/sql/updates/world/2015_03_07_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_00_world.sql
diff --git a/sql/updates/world/2015_03_07_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_01_world.sql
index 40df9138eb4..40df9138eb4 100644
--- a/sql/updates/world/2015_03_07_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_01_world.sql
diff --git a/sql/updates/world/2015_03_07_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_02_world.sql
index 5b48fd9779e..5b48fd9779e 100644
--- a/sql/updates/world/2015_03_07_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_02_world.sql
diff --git a/sql/updates/world/2015_03_07_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_03_world.sql
index 8d8fe3be881..8d8fe3be881 100644
--- a/sql/updates/world/2015_03_07_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_07_03_world.sql
diff --git a/sql/updates/world/2015_03_08_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_08_00_world.sql
index 3bf1b2410ce..3bf1b2410ce 100644
--- a/sql/updates/world/2015_03_08_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_08_00_world.sql
diff --git a/sql/updates/world/2015_03_08_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_08_01_world.sql
index ddbc46739b1..ddbc46739b1 100644
--- a/sql/updates/world/2015_03_08_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_08_01_world.sql
diff --git a/sql/updates/world/2015_03_10_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_00_world.sql
index ade4e39c13b..ade4e39c13b 100644
--- a/sql/updates/world/2015_03_10_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_00_world.sql
diff --git a/sql/updates/world/2015_03_10_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_01_world.sql
index e2e945eb86d..e2e945eb86d 100644
--- a/sql/updates/world/2015_03_10_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_01_world.sql
diff --git a/sql/updates/world/2015_03_10_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_02_world.sql
index c692d88825f..c692d88825f 100644
--- a/sql/updates/world/2015_03_10_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_02_world.sql
diff --git a/sql/updates/world/2015_03_10_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_03_world.sql
index 4028abb8fdc..4028abb8fdc 100644
--- a/sql/updates/world/2015_03_10_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_03_world.sql
diff --git a/sql/updates/world/2015_03_10_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_04_world.sql
index 9fa686c09ec..9fa686c09ec 100644
--- a/sql/updates/world/2015_03_10_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_04_world.sql
diff --git a/sql/updates/world/2015_03_10_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_05_world.sql
index 55cb5f9006a..55cb5f9006a 100644
--- a/sql/updates/world/2015_03_10_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_05_world.sql
diff --git a/sql/updates/world/2015_03_10_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_06_world.sql
index 2a943f00037..2a943f00037 100644
--- a/sql/updates/world/2015_03_10_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_06_world.sql
diff --git a/sql/updates/world/2015_03_10_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_07_world.sql
index cd2023ea5b8..cd2023ea5b8 100644
--- a/sql/updates/world/2015_03_10_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_07_world.sql
diff --git a/sql/updates/world/2015_03_10_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_08_world.sql
index 2992a858dc6..2992a858dc6 100644
--- a/sql/updates/world/2015_03_10_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_08_world.sql
diff --git a/sql/updates/world/2015_03_10_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_09_world.sql
index fd50bbb5037..fd50bbb5037 100644
--- a/sql/updates/world/2015_03_10_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_09_world.sql
diff --git a/sql/updates/world/2015_03_10_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_10_world.sql
index d3e1220006e..d3e1220006e 100644
--- a/sql/updates/world/2015_03_10_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_10_10_world.sql
diff --git a/sql/updates/world/2015_03_12_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_12_00_world.sql
index f8251f9b2b4..f8251f9b2b4 100644
--- a/sql/updates/world/2015_03_12_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_12_00_world.sql
diff --git a/sql/updates/world/2015_03_12_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_12_01_world.sql
index 8c6dc8fe248..8c6dc8fe248 100644
--- a/sql/updates/world/2015_03_12_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_12_01_world.sql
diff --git a/sql/updates/world/2015_03_14_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_14_00_world.sql
index 71a17359756..71a17359756 100644
--- a/sql/updates/world/2015_03_14_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_14_00_world.sql
diff --git a/sql/updates/world/2015_03_14_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_14_01_world.sql
index f99651da7b9..f99651da7b9 100644
--- a/sql/updates/world/2015_03_14_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_14_01_world.sql
diff --git a/sql/updates/world/2015_03_14_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_14_02_world.sql
index 0c9f0154dec..0c9f0154dec 100644
--- a/sql/updates/world/2015_03_14_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_14_02_world.sql
diff --git a/sql/updates/world/2015_03_15_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_00_world.sql
index 659d167e552..659d167e552 100644
--- a/sql/updates/world/2015_03_15_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_00_world.sql
diff --git a/sql/updates/world/2015_03_15_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_01_world.sql
index 3df79d26dad..3df79d26dad 100644
--- a/sql/updates/world/2015_03_15_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_01_world.sql
diff --git a/sql/updates/world/2015_03_15_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_02_world.sql
index 0038b6a8927..0038b6a8927 100644
--- a/sql/updates/world/2015_03_15_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_02_world.sql
diff --git a/sql/updates/world/2015_03_15_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_03_world.sql
index b9b4ea7a247..b9b4ea7a247 100644
--- a/sql/updates/world/2015_03_15_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_03_world.sql
diff --git a/sql/updates/world/2015_03_15_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_04_world.sql
index b439d0f3a78..b439d0f3a78 100644
--- a/sql/updates/world/2015_03_15_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_04_world.sql
diff --git a/sql/updates/world/2015_03_15_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_05_world.sql
index 8aed78b7305..8aed78b7305 100644
--- a/sql/updates/world/2015_03_15_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_05_world.sql
diff --git a/sql/updates/world/2015_03_15_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_06_world.sql
index 4fc3ab011ab..4fc3ab011ab 100644
--- a/sql/updates/world/2015_03_15_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_06_world.sql
diff --git a/sql/updates/world/2015_03_15_07_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_07_world.sql
index 64f813d2c59..64f813d2c59 100644
--- a/sql/updates/world/2015_03_15_07_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_07_world.sql
diff --git a/sql/updates/world/2015_03_15_08_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_08_world.sql
index e7acf61bbd6..e7acf61bbd6 100644
--- a/sql/updates/world/2015_03_15_08_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_08_world.sql
diff --git a/sql/updates/world/2015_03_15_09_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_09_world.sql
index cb453b9b4a6..cb453b9b4a6 100644
--- a/sql/updates/world/2015_03_15_09_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_09_world.sql
diff --git a/sql/updates/world/2015_03_15_10_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_10_world.sql
index b639c813766..b639c813766 100644
--- a/sql/updates/world/2015_03_15_10_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_10_world.sql
diff --git a/sql/updates/world/2015_03_15_11_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_11_world.sql
index 3330613ef6c..3330613ef6c 100644
--- a/sql/updates/world/2015_03_15_11_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_11_world.sql
diff --git a/sql/updates/world/2015_03_15_12_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_12_world.sql
index 7eb2c704211..7eb2c704211 100644
--- a/sql/updates/world/2015_03_15_12_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_12_world.sql
diff --git a/sql/updates/world/2015_03_15_13_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_13_world.sql
index f88dd641542..f88dd641542 100644
--- a/sql/updates/world/2015_03_15_13_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_13_world.sql
diff --git a/sql/updates/world/2015_03_15_14_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_14_world.sql
index a74f3f67554..a74f3f67554 100644
--- a/sql/updates/world/2015_03_15_14_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_15_14_world.sql
diff --git a/sql/updates/world/2015_03_16_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_00_world.sql
index 9fc5a435615..9fc5a435615 100644
--- a/sql/updates/world/2015_03_16_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_00_world.sql
diff --git a/sql/updates/world/2015_03_16_01_world_335.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_01_world_335.sql
index 2a0886c6ece..2a0886c6ece 100644
--- a/sql/updates/world/2015_03_16_01_world_335.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_01_world_335.sql
diff --git a/sql/updates/world/2015_03_16_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_02_world.sql
index 60b305829cb..60b305829cb 100644
--- a/sql/updates/world/2015_03_16_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_02_world.sql
diff --git a/sql/updates/world/2015_03_16_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_03_world.sql
index 98bd8be7da1..98bd8be7da1 100644
--- a/sql/updates/world/2015_03_16_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_03_world.sql
diff --git a/sql/updates/world/2015_03_16_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_04_world.sql
index 6cd793dd55f..6cd793dd55f 100644
--- a/sql/updates/world/2015_03_16_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_04_world.sql
diff --git a/sql/updates/world/2015_03_16_05_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_05_world.sql
index fa123614224..fa123614224 100644
--- a/sql/updates/world/2015_03_16_05_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_05_world.sql
diff --git a/sql/updates/world/2015_03_16_06_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_06_world.sql
index 237bbe658ce..237bbe658ce 100644
--- a/sql/updates/world/2015_03_16_06_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_16_06_world.sql
diff --git a/sql/updates/world/2015_03_17_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_17_00_world.sql
index 20167f615b6..20167f615b6 100644
--- a/sql/updates/world/2015_03_17_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_17_00_world.sql
diff --git a/sql/updates/world/2015_03_17_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_17_01_world.sql
index 8b91179bb48..8b91179bb48 100644
--- a/sql/updates/world/2015_03_17_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_17_01_world.sql
diff --git a/sql/updates/world/2015_03_17_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_17_02_world.sql
index 79d0b382d12..79d0b382d12 100644
--- a/sql/updates/world/2015_03_17_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_17_02_world.sql
diff --git a/sql/updates/world/2015_03_19_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_19_00_world.sql
index 1d87dafb9f1..1d87dafb9f1 100644
--- a/sql/updates/world/2015_03_19_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_19_00_world.sql
diff --git a/sql/updates/world/2015_03_20_00_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_00_world.sql
index 93083732c4d..93083732c4d 100644
--- a/sql/updates/world/2015_03_20_00_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_00_world.sql
diff --git a/sql/updates/world/2015_03_20_01_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_01_world.sql
index a489bcc9a4e..a489bcc9a4e 100644
--- a/sql/updates/world/2015_03_20_01_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_01_world.sql
diff --git a/sql/updates/world/2015_03_20_02_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_02_world.sql
index 05c120274da..05c120274da 100644
--- a/sql/updates/world/2015_03_20_02_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_02_world.sql
diff --git a/sql/updates/world/2015_03_20_03_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_03_world.sql
index e8f9680dbee..e8f9680dbee 100644
--- a/sql/updates/world/2015_03_20_03_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_03_world.sql
diff --git a/sql/updates/world/2015_03_20_04_world.sql b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_04_world.sql
index 2786dc1ef4e..2786dc1ef4e 100644
--- a/sql/updates/world/2015_03_20_04_world.sql
+++ b/sql/old/3.3.5a/world/57_2014_10_19/2015_03_20_04_world.sql
diff --git a/sql/old/3.3.5a/world/CREATE_SUBDIRECTORIES_HERE b/sql/old/3.3.5a/world/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/3.3.5a/world/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/world/2015_03_21_00_world.sql b/sql/updates/world/2015_03_21_00_world.sql
new file mode 100644
index 00000000000..d1eee836dd0
--- /dev/null
+++ b/sql/updates/world/2015_03_21_00_world.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.58', `cache_id`=58 LIMIT 1;
diff --git a/sql/updates/world/2015_03_21_01_world.sql b/sql/updates/world/2015_03_21_01_world.sql
deleted file mode 100644
index 82b5304ef7b..00000000000
--- a/sql/updates/world/2015_03_21_01_world.sql
+++ /dev/null
@@ -1,60 +0,0 @@
-SET @CGUID := 69713; -- 4 free guid set by TC
-SET @OGUID := 6144; -- 2 free guid set by TC
-
-DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID AND @CGUID+3;
-INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `curhealth`, `spawndist`, `MovementType`) VALUES
-(@CGUID+0, 21318, 530, 1, 1, -3800.380, 2601.100, 90.14300, 5.481630, 180, 6986, 0, 0),
-(@CGUID+1, 21310, 530, 1, 1, -3802.939, 2594.501, 92.709, 1.605702, 300, 6986, 0, 0),
-(@CGUID+2, 21310, 530, 1, 1, -3794.054, 2588.724, 92.709, 1.905461, 300, 6986, 0, 0),
-(@CGUID+3, 21310, 530, 1, 1, -3788.540, 2597.479, 92.709, 3.382006, 300, 6986, 0, 0);
-
-DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+1;
-INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
-(@OGUID+0, 184731, 530, 1, 1, -3802.939, 2594.501, 92.18282, 1.605702, 0, 0, 0, 1, 120, 255, 1), -- 184731 (Area: -1)
-(@OGUID+1, 184731, 530, 1, 1, -3794.054, 2588.724, 92.18282, 1.905461, 0, 0, 0, 1, 120, 255, 1); -- 184731 (Area: -1)
-
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (21310, 21309);
-UPDATE `creature_template` SET `InhabitType`=4, `gossip_menu_id`=8287, `AIName`='SmartAI' WHERE `entry`=21292;
-UPDATE `creature_template` SET `gossip_menu_id`=8288, `AIName`='SmartAI' WHERE `entry`=21318;
-
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-@CGUID+1, -@CGUID+2, -@CGUID+3, -74618, 21318, 21292, 21309);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(-74618,0,0,0,1,0,100,1,0,0,0,0,11,36558,0,0,0,0,0,19,21292,30,0,0,0,0,0,'Shadowmoon Valley Invisible Trigger (Tiny) - OOC no repeat - Cast Ar''tor''s Prison'),
-(-@CGUID+1,0,0,0,1,0,100,1,0,0,0,0,11,36558,0,0,0,0,0,19,21292,30,0,0,0,0,0,'Shadowmoon Valley Invisible Trigger (Tiny) - OOC no repeat - Cast Ar''tor''s Prison'),
-(-@CGUID+2,0,0,0,1,0,100,1,0,0,0,0,11,36558,0,0,0,0,0,19,21292,30,0,0,0,0,0,'Shadowmoon Valley Invisible Trigger (Tiny) - OOC no repeat - Cast Ar''tor''s Prison'),
-(-@CGUID+3,0,0,0,1,0,100,1,0,0,0,0,11,36558,0,0,0,0,0,19,21292,30,0,0,0,0,0,'Shadowmoon Valley Invisible Trigger (Tiny) - OOC no repeat - Cast Ar''tor''s Prison'),
-(21292,0,0,0,20,0,100,0,10528,0,0,0,45,0,1,0,0,0,0,19,21318,20,0,0,0,0,0, 'Ar''tor, Son of Oronok - -On quest Rewarded - Set Data'),
-(21318,0,0,0,38,0,100,0,0,1,0,0,1,0,0,0,0,0,0,21,30,0,0,0,0,0,0, 'Spirit of Ar''tor -On Data set - Talk'),
-(21309,0,0,0,0,0,100,0,5000,7000,20000,25000,11,38048,0,0,0,0,0,2,0,0,0,0,0,0,0,"Painmistress Gabrissa - In Combat - Cast 'Curse of Pain'"),
-(21309,0,1,0,0,0,100,0,6000,7000,17000,20000,11,38169,0,0,0,0,0,2,0,0,0,0,0,0,0,"Painmistress Gabrissa - In Combat - Cast 'Curse of Pain'"),
-(21309,0,2,0,25,0,100,0,0,0,0,0,11,32783,0,0,0,0,0,1,0,0,0,0,0,0,0,"Painmistress Gabrissa - On reset - Cast 'Arcane Channeling'");
-
-DELETE FROM `creature_text` WHERE `entry`=21318;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`, `BroadcastTextID`) VALUES
-(21318,0,0,'I... I have died... I was in so much pain... engulfed in darkness... Can you see me, $r?',12,0,100,0,0,0, 'Spirit of Ar''tor ', 18993);
-
-DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID+1, @CGUID+2, @CGUID+3, 74618);
-INSERT INTO `creature_addon` (`guid`,`bytes1`,`bytes2`, `emote`, `auras`) VALUES
-(@CGUID+1,0,4097,0,"60194"),
-(@CGUID+2,0,4097,0,"60194"),
-(@CGUID+3,0,4097,0,"60194"),
-(74618,0,4097,0,"60194");
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (21307, 21292);
-INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`, `emote`, `auras`) VALUES
-(21292,0,4097,383,""),
-(21307,0,4097,0,"31261");
-
-DELETE FROM `gossip_menu` WHERE `entry`=8288 AND `text_id`=10327;
-DELETE FROM `gossip_menu` WHERE `entry`=8287 AND `text_id`=10323;
-INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
-(8287, 10323),
-(8288, 10327);
-
-DELETE FROM `spell_area` WHERE `spell`=60197 AND `area`=3752;
-INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
-(60197, 3752, 10528, 0, 0, 0, 2, 1, 64, 0);
-
-DELETE FROM `spell_area` WHERE `spell`=60194 AND `area`=3752;
-INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
-(60194, 3752, 0, 10528, 0, 0, 2, 1, 0, 11);
diff --git a/sql/updates/world/2015_03_21_02_world.sql b/sql/updates/world/2015_03_21_02_world.sql
deleted file mode 100644
index 831bf907912..00000000000
--- a/sql/updates/world/2015_03_21_02_world.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 23161;
-INSERT INTO `spell_linked_spell` VALUES (23161, 31725, 0, 'Summon Nightmare');
-
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 5784;
-INSERT INTO `spell_linked_spell` VALUES (5784, 31725, 0, 'Summon felsteed');