Adding Paladin's "Holy Wrath" to merge list.
Adding options for mega damage per frame and some other options.
Merge branch 'master' of https://github.com/dandruff/xCT

Conflicts:
	modules/frames.lua