Added / removed "now entering trader" messages
Added hero trader
Moved hero to new trader, deleted old hero objects