added color convert from string
merging in color from string in histobook
Merge remote-tracking branch 'upstream/master'
merging