Update the CC version number.
Merge branch 'master' of https://github.com/cbhaley/calibre
Make check_library process cover files even if .jpg is added to ignored extensions. Fix typo in list name.
Make check library process cover files even if .jpg is added to the list of extensions to ignore

Merge branch 'master' of https://github.com/cbhaley/calibre
DOCX Input: Fix incorrect numbering being generated for numbered lists in some circumstances. Fixes #1301044 [DOCX conversion of numbered list](https://bugs.launchpad.net/calibre/+bug/1301044)

Apparently, list counters are associated with abstract numbering
definitions and not numbering instances. Also add support for
startOverride.
DOCX Input: Fix para styles for numbering blocks applied via pStyle not being applied
Driver for Tolino Vision (OS X/Linux only). Fixes #1301875 [tolino vision doesn´t work with calibre](https://bugs.launchpad.net/calibre/+bug/1301875)
A method to add many custom recipes at once
...
DRY
calibredb check_library: Do not create empty library if user specifies incorrect path
version 1.31
Make the list of color names tooltip appear when creating an enum column as well as when editing one.
Merge branch 'master' of https://github.com/cbhaley/calibre
Allow specifying arbitrary colors for column coloring rules
Allow specifying arbitrary colors as hex triplets when creating custom columns with a fixed set of values. Fixes #1302078 [Allowing RGB colors for custom columns](https://bugs.launchpad.net/calibre/+bug/1302078)
Dont serialize alpha color component as the QColor constructor cannot handle them
Add Kovid's ColorButton to the advanced coloring rule editor
Merge branch 'master' of https://github.com/cbhaley/calibre
Add sample colored text to the list of column coloring rules