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

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp

sql/updates/world/2014_10_12_02_world.sql

@@ -0,0 +1,2 @@
+--
+DELETE FROM `spell_dbc` WHERE `Id` = 100001;

sql/updates/world/2014_10_12_03_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `spell_dbc` SET `AttributesEx3` = 0 WHERE `Id` = 65142;

sql/updates/world/2014_10_12_04_world.sql

@@ -0,0 +1,3 @@
+UPDATE `smart_scripts` SET `link`=12 WHERE `entryorguid`=11680 AND `source_type`=0 AND `id`=11;
+UPDATE `smart_scripts` SET `link`=2 WHERE `entryorguid`=18855 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=18 WHERE `entryorguid`=26670 AND `source_type`=0 AND `id`=18;

sql/updates/world/2014_10_12_05_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `spell_dbc` SET `AttributesEx3` = 128 WHERE `Id` = 65142;

sql/updates/world/2014_10_12_06_world.sql

@@ -0,0 +1,8 @@
+DELETE FROM `creature_loot_template` WHERE `Entry`=15623;
+INSERT INTO `creature_loot_template`(`Entry`,`Item`,`Chance`,`MinCount`,`MaxCount`) VALUES
+(15623,14047,19,1,4),
+(15623,14256,3,1,1),
+(15623,8952,2,1,1),
+(15623,13446,1.3,1,1),
+(15623,13443,0.3,1,1),
+(15623,14283,0.11,1,1);

sql/updates/world/2014_10_12_07_world.sql

@@ -0,0 +1,2 @@
+DELETE FROM `creature_loot_template` WHERE `Entry`=15623 AND `Item`=12002;
+INSERT INTO `creature_loot_template`(`Entry`,`Item`,`Chance`,`MinCount`,`MaxCount`) VALUE (15623,12002,0.13,1,1);