Updated some NPCs, ref #1241
Secret Service Storage/aid/uid values
Merge pull request #1309 from Skillert/storage

Secret Service Storage/aid/uid values
Merge pull request #1308 from EPuncker/master

Updated some NPCs, ref #1241