Fixed a client crash created by a merge from EQEmu.

Merchants will no longer give you a price for NoDrop items.
Merge branch 'master' of https://github.com/cavedude00/Server