Removed MarkupInventoryMaterialManager.

Use MaterialPackageManager instead.
Merged master.