Merge remote-tracking branch 'Lydia/master'

locations/npcstatic6.qsrc

@@ -202,7 +202,7 @@ hotcat_rating['A<<npctemp>>'] = 8
 npctemp = 262
 $npc_dna['A<<npctemp>>'] = '0'
 $npc_firstname['A<<npctemp>>'] = 'Aliyyah'
-$npc_nickname['A<<npctemp>>'] = 'Aliyyah'
+$npc_nickname['A<<npctemp>>'] = 'Allie'
 $npc_lastname['A<<npctemp>>'] = 'Najjar'
 $npc_notes['A<<npctemp>>'] = 'Proprietor of the Hookah Lounge.'
 npc_dob['A<<npctemp>>'] = 19910314