Added outline for render system, model and material
Merge fixes