Color issue with color uploading fix. Color inference
Merge branch 'master' of github.com:Sankore/Sankore-3.1