Add Kovid's ColorButton to the advanced coloring rule editor
Merge branch 'master' of https://github.com/cbhaley/calibre