Fix bugs with inventory handling
Merge branch 'master' of https://github.com/shadowjay1/PrisonPearl into dev
Rev version for 82713073ed19