Updated some NPCs, ref #1241
Merge pull request #1308 from EPuncker/master

Updated some NPCs, ref #1241