Command & Set changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipse/mods/essencepvp.db
Merge branch 'master' of https://github.com/EterniaLogic/EssencePVPMod