NPC spawning and despawning
Merge remote-tracking branch 'origin/npc-dev' into aside