Holy Pala Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rotations/Paladin/Holy.lua