Fixed Adding Items to Inventory bug
Merge origin/master