Fix /npc skin creating unloadable NPCs
Merge branch 'master' of https://github.com/CitizensDev/Citizens2