colored entities
Fixed the coloring of entities
Did magic, works perfectly.
Merge remote-tracking branch 'origin/master' into rendering