Merge pull request #1 from aidancbrady/development

Development
Add minor safeguard for ItemProxy's in player invs
Formatting derps
Merge pull request #1000 from tterrag1098/development

ItemProxies in player invs will now disappear instantly