Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

sql/updates/world/2014_10_10_00_world.sql

@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `unit_flags`=320, `flags_extra`=2 WHERE `entry` IN(36065,36066); 
+DELETE FROM `creature_template_addon` WHERE `entry` IN(36066, 36065);
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(36066, 0, 0x2000000, 0x1, ''),
+(36065, 0, 0x2000000, 0x1, '');

sql/updates/world/2014_10_10_01_world_335.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `gameobject_template` WHERE `entry` = 180671;
+INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `data0`, `data1`, `VerifiedBuild`) VALUES
+(180671,3,644,'Xandivious\' Demon Bag',43,17516,-18019);

sql/updates/world/2014_10_10_02_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `creature_loot_template` SET `item`=49426 WHERE `entry`=38433 AND `item`=47241;

sql/updates/world/2014_10_10_03_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `gameobject_loot_template` WHERE `Entry` = 17516;
+INSERT INTO `gameobject_loot_template` (`Entry`,`Item`,`Chance`,`QuestRequired`) VALUES
+(17516,21145,100,1);

sql/updates/world/2014_10_10_04_world_335.sql

@@ -0,0 +1,5 @@
+--
+DELETE FROM `gameobject_template` WHERE `entry` IN (202947,202948);
+INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `data0`, `data1`, `VerifiedBuild`) VALUES
+(202947,3,9467,'Cologne Neutralizer',93,28677,15211),
+(202948,3,9468,'Perfume Neutralizer',93,28678,15211);

sql/updates/world/2014_10_10_05_world.sql

@@ -0,0 +1,5 @@
+--
+DELETE FROM `gameobject_loot_template` WHERE `Entry` IN (28677,28678);
+INSERT INTO `gameobject_loot_template` (`Entry`,`Item`,`Chance`,`QuestRequired`) VALUES
+(28677,49352,100,1),
+(28678,49351,100,1);

src/server/collision/Management/VMapManager2.cpp

@@ -27,6 +27,7 @@
 #include <G3D/Vector3.h>
 #include "Log.h"
 #include "VMapDefinitions.h"
+#include "Errors.h"
 
 using G3D::Vector3;