Merge branch 'master' into Playerbot

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

src/server/database/Database/Implementation/CharacterDatabase.cpp

@@ -596,6 +596,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
 
     // Character names
     PrepareStatement(CHAR_INS_RESERVED_PLAYER_NAME, "INSERT IGNORE INTO reserved_name (name) VALUES (?)", CONNECTION_ASYNC);
+    PrepareStatement(CHAR_INS_PROFANITY_PLAYER_NAME, "INSERT IGNORE INTO profanity_name (name) VALUES (?)", CONNECTION_ASYNC);
 
     // Character settings
     PrepareStatement(CHAR_SEL_CHAR_SETTINGS, "SELECT source, data FROM character_settings WHERE guid = ?", CONNECTION_ASYNC);

src/server/database/Database/Implementation/CharacterDatabase.h

@@ -510,6 +510,7 @@ enum CharacterDatabaseStatements : uint32
     CHAR_SEL_ARENAPOINTS,
 
     CHAR_INS_RESERVED_PLAYER_NAME,
+    CHAR_INS_PROFANITY_PLAYER_NAME,
 
     CHAR_SEL_CHAR_SETTINGS,
     CHAR_REP_CHAR_SETTINGS,