Add face color mapping
Merge branch 'Model-Branch'