Merge branch 'github.com/master'
Merge branch 'master-2'
Included CAT02 colorspace of CIECAM02 and HSI color space of Keim et al.
Added Eurovis Paper Colormap
Merge remote-tracking branch 'sebastian/master'