Mercenaries now spawn as the same Gender and Size of the Merchant they are purchased from.
Mercenaries now spawn with randomized facial features when purchased.
Setting a lastname for NPCs will now override any hard coded lastname (such as GM Trainers).
Crash fix, this check got removed accidentally
Merge branch 'master' into random

Conflicts:
	zone/command.cpp
	zone/merc.cpp
Update to new random functions