Inventory
Merge branch 'master' of https://github.com/floAr/WarTornLands

Conflicts:
	WarTornLandsRefurbished/WarTornLandsRefurbished/Entities/Modules/Collide/PickUpOnCollide.cs
	WarTornLandsRefurbished/WarTornLandsRefurbished/Game1.cs
	WarTornLandsRefurbished/WarTornLandsRefurbished/Infrastructure/Interface.cs
	WarTornLandsRefurbished/WarTornLandsRefurbished/Infrastructure/Systems/GameState/States/InventoryState.cs
	WarTornLandsRefurbished/WarTornLandsRefurbished/PlayerClasses/Inventory.cs
	WarTornLandsRefurbished/WarTornLandsRefurbished/World/GlobalState.cs
Merge branch 'master' of https://github.com/floAr/WarTornLands