Updated some Edron NPCs, ref #1192
Merge pull request #1196 from EPuncker/master

Updated some Edron NPCs, ref #1192