Merge branch 'master' into Playerbot

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

src/server/apps/worldserver/worldserver.conf.dist

@@ -626,6 +626,24 @@ RealmZone = 1
 
 World.RealmAvailability = 1
 
+#
+#   StrictNames.Reserved
+#       Description: Use the Reserved Filter from DBC.
+#                    Prevents Player, Pet & Charter names from containing reserved names.
+#       Default:     1 - Enabled
+#                    0 - Disabled
+
+StrictNames.Reserved = 1
+
+#
+#   StrictNames.Profanity
+#       Description: Use the Profanity Filter from DBC.
+#                    Prevents Player, Pet & Charter names from containing profanity.
+#       Default:     1 - Enabled
+#                    0 - Disabled
+
+StrictNames.Profanity = 1
+
 #
 #    StrictPlayerNames
 #        Description: Limit player name to language specific symbol set. Prevents character
@@ -3820,6 +3838,14 @@ QuestPOI.Enabled = 1
 
 ChangeFaction.MaxMoney = 0
 
+#
+#     Pet.RankMod.Health
+#        Description: Allows pet health to be modified by rank health rates (set in config)
+#        Default:     1 - Enabled
+#                     0 - Disabled
+
+Pet.RankMod.Health = 1
+
 #
 ###################################################################################################