Cherry pick FixedEntityModel work.
Small fixes and improvements
Merge pull request #465 from est77/est

Added FixedModelEntity, MaterialCollectionItem and other changes needed for GSoC