more inventory related fixes/additions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CellAO/SolutionAssemblyInfo.cs