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

Conflicts:
	zone/merc.h