Shaman changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClassLibs/Shaman/SpellList.lua