Inventory fix.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Client/Source/MainMenu.cpp