Potion/Inventory bug fixes
Merge branch 'master' of https://github.com/holdenmc/Moria