Merge pull request #320 from kirk24788/master

Rotations, findMeAggroTank and jpconditionparser
merge upstream