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

diff --git a/Database/Alchemy.lua b/Database/Alchemy.lua
index d802a40..81da089 100644
--- a/Database/Alchemy.lua
+++ b/Database/Alchemy.lua
@@ -757,8 +757,8 @@ function addon:InitAlchemy()

 	-- Elixir of Empowerment -- 28578
 	AddRecipe(28578, 365, 22848, Q.UNCOMMON, V.TBC, 365, 375, 377, 380)
-	self:AddRecipeFlags(28578, F.ALLIANCE, F.HORDE, F.TRAINER, F.MOB_DROP, F.IBOE, F.RBOP)
-	self:AddRecipeAcquire(28578, A.MOB, 24664)
+	self:AddRecipeFlags(28578, F.ALLIANCE, F.HORDE, F.WORLD_DROP, F.MOB_DROP, F.IBOE, F.RBOP)
+	self:AddRecipeAcquire(28578, A.MOB, 24664, A.WORLD_DROP, 2)

 	-- Ironshield Potion -- 28579
 	AddRecipe(28579, 365, 22849, Q.UNCOMMON, V.TBC, 365, 375, 377, 380)
diff --git a/Datamine.lua b/Datamine.lua
index 0133998..6ce93bc 100644
--- a/Datamine.lua
+++ b/Datamine.lua
@@ -193,7 +193,7 @@ local SPELL_TO_RECIPE_MAP = {
 	[46144] = 35211, 	[54978] = 41124, 	[54979] = 41123, 	[54980] = 41120,
 	[54981] = 41122, 	[62202] = 44938, 	[63187] = 45088, 	[63188] = 45089,
 	[63189] = 45090, 	[63190] = 45091, 	[63191] = 45092, 	[63192] = 45093,
-	[67091] = 47622, 	[67130] = 47460, 	[67092] = 47623, 	[67131] = 47641,
+	[67091] = 47622, 	[67130] = 47640, 	[67092] = 47623, 	[67131] = 47641,
 	[67096] = 47627, 	[67135] = 47642, 	[67095] = 47626, 	[67134] = 47643,
 	[67093] = 47624, 	[67132] = 47644, 	[67094] = 47625, 	[67133] = 47645,
 	[70563] = 49970,	[70567] = 49973,	[70565] = 49971,	[70566] = 49972,
@@ -1820,9 +1820,11 @@ do
 		-------------------------------------------------------------------------------
 		[32441] = true,   [32443] = true,  [12687] = true, [12714] = true,  [12688 ] = true,
 		[35211] = true,  [35209] = true, [35210] = true,    [12706] = true,  [7982] = true,
-		[12718] = true,
-		[23621] = true,	[35208] = true,	[12716] = true,	[23632] = true,	[23633] = true,
-
+		[12718] = true,		[23621] = true,	[35208] = true,	[12716] = true,	[23632] = true,
+		[23633] = true,	[30324] = true,	[23637] = true,	[31393] = true,[22221] = true,
+		[12690] = true,	[31394] = true,[31395] = true,[23630] = true,[23629] = true,[7978] = true,
+		[41120] = true,	[12717] = true,[22219] = true,[23627] = true,
+
 		-------------------------------------------------------------------------------
 		--Engineering
 		-------------------------------------------------------------------------------