matches what is being pushed into the client
Merge branch 'master' of https://github.com/CeilingFanSoftware/JPS

Conflicts:
	Rotations/druid_feral.lua
Deleted old files