Real fix for GM trainer crash..evidently the problem went deeper than an undefined condition...
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	changelog.txt
Merge git://github.com/EQEmu/Server into Custom
C! pre merge