Merge branch 'master' of git.wowace.com:wow/arl/mainline

diff --git a/Database/Blacksmithing.lua b/Database/Blacksmithing.lua
index dc8e528..aba270e 100644
--- a/Database/Blacksmithing.lua
+++ b/Database/Blacksmithing.lua
@@ -283,7 +283,7 @@ function addon:InitBlacksmithing()
 	-- Solid Iron Maul -- 3494
 	AddRecipe(3494, 155, 3851, Q.COMMON, V.ORIG, 155, 180, 192, 205)
 	self:AddRecipeFlags(3494, F.ALLIANCE, F.HORDE, F.VENDOR, F.IBOE, F.RBOE, F.TWO_HAND, F.MACE)
-	self:AddRecipeVendor(3494, 9179, 8878, 1471)
+	self:AddRecipeLimitedVendor(3494, 9179, 1, 8878, 1, 1471, 1, 26081, 1)

 	-- Golden Iron Destroyer -- 3495
 	AddRecipe(3495, 170, 3852, Q.UNCOMMON, V.ORIG, 170, 195, 207, 220)
diff --git a/Database/Tailoring.lua b/Database/Tailoring.lua
index c169630..61c8a5e 100644
--- a/Database/Tailoring.lua
+++ b/Database/Tailoring.lua
@@ -1501,7 +1501,7 @@ function addon:InitTailoring()

 	-- Belt of Blasting -- 36315
 	AddRecipe(36315, 375, 30038, Q.EPIC, V.TBC, 375, 385, 390, 395)
-	self:AddRecipeFlags(36315, F.ALLIANCE, F.HORDE, F.RAID, F.IBOE, F.RBOE, F.HEALER, F.CASTER, F.CLOTH)
+	self:AddRecipeFlags(36315, F.ALLIANCE, F.HORDE, F.RAID, F.IBOE, F.RBOP, F.HEALER, F.CASTER, F.CLOTH)
 	self:AddRecipeAcquire(36315, A.CUSTOM, 37, A.CUSTOM, 43)

 	-- Belt of the Long Road -- 36316
diff --git a/Database/Vendor.lua b/Database/Vendor.lua
index c6de207..6194b69 100644
--- a/Database/Vendor.lua
+++ b/Database/Vendor.lua
@@ -359,6 +359,7 @@ function addon:InitVendor(DB)
 	AddVendor(23437,	L["Indormi"],				BZ["Hyjal Summit"],		   0,	 0, NEUTRAL)
 	AddVendor(25032,	L["Eldara Dawnrunner"],			BZ["Isle of Quel'Danas"],	47.1, 30.0, NEUTRAL)
 	AddVendor(25950,	L["Shaani"],				BZ["Isle of Quel'Danas"],	51.5, 32.6, NEUTRAL)
+	AddVendor(26081, 	L["High Admiral \"Shelly\" Jorrik"],      BZ["Dun Morogh"], 10.9, 76.1, NEUTRAL)
 	AddVendor(26569,	L["Alys Vol'tyr"],			BZ["Dragonblight"],		36.3, 46.5, HORDE)
 	AddVendor(26868,	L["Provisioner Lorkran"],		BZ["Grizzly Hills"],		22.6, 66.1, HORDE)
 	AddVendor(27030,	L["Bradley Towns"],			BZ["Dragonblight"],		76.9, 62.2, HORDE)
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index 632092f..16bc313 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -897,6 +897,7 @@ L["Haughty Modiste"] = true
 L["Heldan Galesong"] = true
 L["Helenia Olden"] = true
 L["Hgarth"] = true
+L["High Admiral \"Shelly\" Jorrik"] = true
 L["High Enchanter Bardolan"] = true
 L["Highlord Darion Mograine"] = true
 L["Hillsbrad Tailor"] = true