Fixed Inventory

* Some buggs remain. I think it could be GUI? :S
Merge branch 'master' of https://github.com/Malow/NotDeadYet