Simplified the ColorReference generation
Merge remote-tracking branch 'origin/master' into 3.1/vaclavSamples
Rebuilt the shapes samples
Merge remote-tracking branch 'origin/master' into 3.1/vaclavSamples