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

sql/updates/world/2014_07_06_01_world_misc.sql

@@ -0,0 +1,10 @@
+--
+SET @GUID=5412;
+
+DELETE FROM `gameobject` WHERE `id`=188367;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(@GUID,188367,571,1,1,5048.28,-4817.63,219.778,2.49582,0,0,0,1,-60,255,1,0);
+
+DELETE FROM `event_scripts` WHERE `id`=17566;
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(17566,0,9,@GUID,60,0,0,0,0,0);

sql/updates/world/2014_07_06_02_world_misc.sql

@@ -0,0 +1,4 @@
+--
+UPDATE `creature_template` SET `npcflag`=16777216 WHERE `entry`=25743;
+DELETE FROM `creature_loot_template` WHERE `entry`=25802 AND `item`=35234;
+UPDATE `item_template` SET `flagsCustom`=1 WHERE `entry`=44834;