Allow /npc spawn to use the selected NPC
Merge branch 'master' of https://github.com/CitizensDev/Citizens2