Merge branches 'combine', 'symbiosis-fix' and 'warlock-fixes'
Raidbuffs: rewritten the RaidBuffer to check every spells that provides a given buff.
Merge branch 'master' of github.com:Adirelle/Cork
Merge branch 'raid-buffer-rewrite'

Conflicts:
	modules/Warlock.lua