Windows compile fix
Merge branch 'master' of https://github.com/EQEmu/Server into inventory_conversion