Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/World/World.h

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

@@ -2483,6 +2483,15 @@ Rate.Pet.LevelXP = 0.05
 
 WaterBreath.Timer = 180000
 
+#
+#    EnableLowLevelRegenBoost
+#        Description: Greatly increase Health and Mana regen rates for players under level 15 (Added in patch 3.3)
+#        Default:     1 - Enabled
+#                     0 - Disabled
+#
+
+EnableLowLevelRegenBoost = 1
+
 #
 #    SkillGain.Crafting
 #    SkillGain.Defense
@@ -3794,6 +3803,14 @@ JoinBGAndLFG.Enable = 0
 
 LeaveGroupOnLogout.Enabled = 1
 
+#
+#   QuestPOI.Enabled
+#        Description: Show points of interest on the map
+#        Default:     1 - Enabled
+#                     0 - Disabled
+
+QuestPOI.Enabled = 1
+
 #
 #     ChangeFaction.MaxMoney
 #        Description: Maximum amount of gold allowed on the character to perform a faction change.