Modifications to Inventory code
Merge branch 'dev-nick' into dev
Merge branch 'dev' of github.com:ManickYoj/Cartographer into dev
I saved this time...
Merge branch 'dev' of github.com:ManickYoj/Cartographer into dev