Merge branch 'master' into Playerbot

src/server/game/Globals/ObjectMgr.cpp

@@ -54,6 +54,8 @@
 #include <boost/algorithm/string.hpp>
 #include <numeric>
 
+#include "ItemEnchantmentMgr.h"
+
 ScriptMapMap sSpellScripts;
 ScriptMapMap sEventScripts;
 ScriptMapMap sWaypointScripts;

src/server/game/Globals/ObjectMgr.h

@@ -20,7 +20,6 @@
 
 #include "Bag.h"
 #include "ConditionMgr.h"
-#include "Corpse.h"
 #include "Creature.h"
 #include "DatabaseEnv.h"
 #include "GameObject.h"