some updates on jps.RaidMode ! Need to add class CDs & encounter abilities (look at DBM)
jps.trinketAbsorbDmg update
Merge branch 'master' of https://github.com/jp-ganis/JPS into beta
spliited jpdata.lua jphealing, moved jpdots, renamed jptips, revmoed duplicate variable L
added some breaks (code style)
Merge branch 'beta' of https://github.com/pcmdgit/JPS into beta

Conflicts:
	Rotations/paladin_holy.lua
	jps.lua
	jps.toc
Merge branch 'beta' of https://github.com/pcmdgit/JPS into beta
merge master into beta
Merge branch 'beta' of https://github.com/pcmdgit/JPS into beta
merge master into beta
jps raid mode + merging beta changes