NPC fixes

Fixed furniture npcs that had most of ids wrong according to items.xml
Added few NPCs
Updated some
ref #702

PS: I'll do a better indentation/fix/update to furniture NPCs that are not in Carlin once I get to their city, for now I've just modified the IDs