Many Whelps (Changes)! Handle It!

[behub-au]

• Class: Rogue, Warlock and Paladin changes.
• Legion: Added 2x Trinkets, 2x DPS Potions (Old War has wrong icon so gave it correct one)
• merge_legion.lua: Cleaned up. Gave it some 'standards' love
• merge_legion.lua: Gave 'Consumables' their own category
• merge_mop.lua: Adjusted CreateMergeHeader to match clean up in merge_legion.lua
• merge_wod.lua: Adjusted CreateMergeHeader to match clean up in merge_legion.lua