* added additional warlock spells
 * fixed warlock's npcId - some MoP NPC's need an additional digit
Merge with master
Added jpevents.lua
Events in jps.lua commented out with --[[JPSEVENT ... ]] - needs to be removed later!
jplogging now switches to debug if jps.Debug is set
Merge pull request #306 from kirk24788/master

new event manager -  jpsevents.lua
fixxed #307
holy pala beta
Merge branch 'beta' of https://github.com/pcmdgit/JPS into beta

Conflicts:
	Rotations/paladin_holy.lua
	jps.lua
	jps.toc