Fixing the market price bug
Merge branch 'Temp' into M6
Chaning the inventory system to say 0 when the item could be there, -1 when it isn't
Merge origin/M6 into M6