int16/32 mismatch fixes. see changelog.txt
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/merc.h
Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	zone/merc.h