Added Quest-NPC to MapLoader and MapEditor
Solved conflicts (hopefully); added Quest-NPC to MapEditor and MapLoader