Some NPC refactoring
Some NPC refactoring; added old woman to main map.
Added hijabi aunty and shaykh; fixed Z-bug.
(NPCs appear under the carpet in the masjid)