actually clean up setting of npc name from GUI
Merge branch 'master' into import_table_models