Merc Fixes Again

 -Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly.

-Merc unsuspend timers should now be more reliable across zone shutdown.

-Fixed a crash issue in RoF.cpp.

-Fixed an emote-related crash reported on the forums.