Merge pull request #1000 from tterrag1098/development

ItemProxies in player invs will now disappear instantly
Merge pull request #2 from aidancbrady/development

Merge pull request #1000 from tterrag1098/development