Remerge branch, Fix Paladin Bonus Healing not scaling with gear with Flash of light and Holy Light
Merge branch 'master' of github.com:meladath/mangos-classic into WIP