Reworked some stuff with Inventory.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/Server/Server.vcxproj.filters