Merge branch 'CombatAnalysis'
Merge branch 'BuffBars'
Merge branch 'TravelWindow'
Merge branch 'LegendaryItemPlanner'
Merge branch 'BusyBee'
Merge branch 'Refer'
Merge branch 'Baruk'

Conflicts:
	Equendil/UI/DecoratedContainer.lua
	Equendil/UI/Resources.lua
Merge branch 'RaidAssistant'
Merge branch 'CraftComp'