Database npc_list.sql bastok z 234 235 236 237 correction
Merge remote-tracking branch 'remotes/upstream/master'