Added Rule NPC:EnableMeritBasedFaction (disabled by default) - Allows faction gain to work similar to experience.
Merge branch 'master' of https://github.com/EQEmu/Server