Fix color naming for Kuler files and allow duplicates
Merge remote-tracking branch 'origin/master'