Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.h

src/server/scripts/Commands/cs_item.cpp

@@ -159,7 +159,7 @@ public:
         return true;
     }
 
-    // TODO - move item to other slot
+    /// @todo - move item to other slot
     static bool HandleItemMoveCommand(ChatHandler* handler, uint8 srcSlot, uint8 dstSlot)
     {
         if (srcSlot == dstSlot)

src/server/scripts/Commands/cs_misc.cpp

@@ -44,7 +44,7 @@
 #include "Tokenize.h"
 #include "WeatherMgr.h"
 
-// TODO: this import is not necessary for compilation and marked as unused by the IDE
+/// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue
 //  there is probably some underlying problem with imports which should properly addressed
 //  see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766