0.2.5
Merge branch 'refs/heads/Test'

Conflicts:
	rotations/paladin/holy.lua