Test
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/client_packet.cpp
Merge branch 'master' of https://github.com/EQEmu/Server
Hopefully fixed that pesky merc memleak and cleaned up mercs a tad.
Forgot changelog :x
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/client_packet.cpp
Fixed mercenary memleaks in AI_Start and Unsuspend.
Merge branch 'master' of https://github.com/EQEmu/Server
Merc message removed.
Merc message removed.

VLD removed, oops.
Merge branch 'master' of https://github.com/SecretsOTheP/Server
Whoops, forgot CMakeLists.txt
Two crash fixes reported on the forums are hopefully fixed.
-Fixed a memleak in inviting mercs to group.
-Fixed a duplicate merc in window bug.
-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.
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/client_packet.cpp
	zone/merc.cpp
	zone/npc.cpp
Merge branch 'master' of https://github.com/SecretsOTheP/Server

Conflicts:
	common/patches/RoF.cpp
Added a few checks to resolve dangling pointers involving Mercs. Similar to the AIYellForHelp crash fixed years ago by Rogean.
Another safeguard against a dangling pointer.
Syntax error, better place for entity list removal