minor changes
Merge remote-tracking branch 'origin/develop-JK' into develop-SN

Conflicts:
	traits/src/net/pureal/traits/graphics/Color.kt
Merge remote-tracking branch 'origin/develop-JK' into develop-SN
updated GL impl to new traits
OpenGl impl: transforms and color
Merge branch 'develop-SN' into develop-MW