Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp

1 files changed, 8 insertions, 7 deletions

diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
index c8d6d749331..283a40d8409 100755
--- a/src/server/game/Handlers/LootHandler.cpp
+++ b/src/server/game/Handlers/LootHandler.cpp
@@ -17,19 +17,20 @@
  */
 
 #include "Common.h"
-#include "WorldPacket.h"
 #include "Log.h"
 #include "Corpse.h"
+#include "Creature.h"
 #include "GameObject.h"
-#include "Player.h"
-#include "ObjectAccessor.h"
-#include "WorldSession.h"
+#include "Group.h"
+#include "GuildMgr.h"
 #include "LootMgr.h"
+#include "ObjectAccessor.h"
 #include "Object.h"
-#include "Group.h"
+#include "Opcodes.h"
+#include "Player.h"
 #include "World.h"
-#include "Util.h"
-#include "GuildMgr.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 
 void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket & recvData)
 {