fixed Ellipse+Circle
updated traits Composed, ColoredElement, Screen
Merge remote-tracking branch 'origin/develop-MW' into develop-JK
Merge remote-tracking branch 'origin/develop-MW' into develop-JK
updated Shape, ColoredShape
Merge remote-tracking branch 'origin/develop-MW' into develop-JK
fixed build