Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

8 files changed, 22 insertions, 0 deletions

diff --git a/sql/updates/world/2014_07_18_00_world_conditions.sql b/sql/updates/world/2014_07_18_00_world_conditions.sql
new file mode 100644
index 00000000000..107402a631d
--- /dev/null
+++ b/sql/updates/world/2014_07_18_00_world_conditions.sql
@@ -0,0 +1 @@
+UPDATE `conditions` SET `NegativeCondition`=0 WHERE `SourceEntry`=51315 AND `ConditionTypeOrReference`=3;
diff --git a/sql/updates/world/2014_07_18_01_world_creature.sql b/sql/updates/world/2014_07_18_01_world_creature.sql
new file mode 100644
index 00000000000..702fbc1aa3a
--- /dev/null
+++ b/sql/updates/world/2014_07_18_01_world_creature.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (202724, 202725, 202728, 202729);
diff --git a/sql/updates/world/2014_07_18_02_world_creature_template.sql b/sql/updates/world/2014_07_18_02_world_creature_template.sql
new file mode 100644
index 00000000000..84280d9d3d5
--- /dev/null
+++ b/sql/updates/world/2014_07_18_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `faction`=11 WHERE entry=20556;
diff --git a/sql/updates/world/2014_07_18_03_world_quest_template.sql b/sql/updates/world/2014_07_18_03_world_quest_template.sql
new file mode 100644
index 00000000000..bd286b8430a
--- /dev/null
+++ b/sql/updates/world/2014_07_18_03_world_quest_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `quest_template` SET `RequestItemsText` = 'Wonderful! You got my memorandum obviously.$b$bIgnore the fools around you, $N. The Holy Light?! The sword and shield?! These aren''t paths for ones as open minded as us. Look at what "normal" magic did to our home. Coupled with those damned tinkerers, our race almost became extinct. And now we have to rely on the dwarves-- they''d rather spend time allying with humans than help us rebuild our own home. We''re like second-class citizens. Have you seen the way they look at us?' WHERE `id` = 3115;
+UPDATE `quest_template` SET `OfferRewardText` = 'But none of that matters. What matters is that you''ve seen your own Holy Light! You know where power truly comes from. You realize that having our own allies is much more... prudent. Special allies. Allies that, no matter the task, will obey till their last breath.$b$bAnd that''s where I come in, $N. I can train you in the beginnings of those special powers. Seek me out often and I will do what I can to teach you more spells.' WHERE `id` = 3115;
diff --git a/sql/updates/world/2014_07_18_04_world_creature_template.sql b/sql/updates/world/2014_07_18_04_world_creature_template.sql
new file mode 100644
index 00000000000..e7f9be10429
--- /dev/null
+++ b/sql/updates/world/2014_07_18_04_world_creature_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `modelid`=17758 WHERE `id` = 17734;
diff --git a/sql/updates/world/2014_07_18_05_world_creature_text.sql b/sql/updates/world/2014_07_18_05_world_creature_text.sql
new file mode 100644
index 00000000000..5e4a59be760
--- /dev/null
+++ b/sql/updates/world/2014_07_18_05_world_creature_text.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `creature_text` WHERE `entry`=1402 AND `groupid`=0 AND `id`>2;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES 
+(1402, 0, 3, 'It''s all their fault, stupid orcs. Had to burn my farm to the ground.', 12, 7, 100, 0, 0, 0, 'Topper McNabb', 187),
+(1402, 0, 4, 'Spare some change for a poor blind man? ...What do you mean I''m not blind? ...I''M NOT BLIND! I CAN SEE!! It''s a miracle!', 12, 7, 100, 0, 0, 0, 'Topper McNabb', 184),
+(1402, 0, 5, 'Alms for the poor?', 12, 7, 100, 0, 0, 0, 'Topper McNabb', 181),
+(1402, 0, 6, 'I will gladly pay you Tuesday for a hamburger today.', 12, 7, 100, 0, 0, 0, 'Topper McNabb', 182),
+(1402, 0, 7, 'It''s all their fault, stupid Alliance army. Just had to build their towers right behind my farm.', 12, 7, 100, 0, 0, 0, 'Topper McNabb', 186);
diff --git a/sql/updates/world/2014_07_18_06_world_quest_template.sql b/sql/updates/world/2014_07_18_06_world_quest_template.sql
new file mode 100644
index 00000000000..0a9231eb19c
--- /dev/null
+++ b/sql/updates/world/2014_07_18_06_world_quest_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template` SET `PrevQuestId`=0 WHERE  `Id`=10302;
diff --git a/sql/updates/world/2014_07_18_07_world_quest_template.sql b/sql/updates/world/2014_07_18_07_world_quest_template.sql
new file mode 100644
index 00000000000..7f71a21dfb1
--- /dev/null
+++ b/sql/updates/world/2014_07_18_07_world_quest_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `Id` IN (9303,9305);