Merge branch 'master' of https://github.com/cbhaley/calibre
Fix #1368794 [Wrong coloring in Title sort (possibly related to 1367943)](https://bugs.launchpad.net/calibre/+bug/1368794)
Add a note about escaping braces in the editor templates
Fix tags with angle brackets not being displayed in the Book Details panel
Fix #1368928 [Another twist of 1367943](https://bugs.launchpad.net/calibre/+bug/1368928)
...
A banner based style for auto generated covers
Workaround for Qt 5 regression that broke selecting multiple icons in Preferences->Column icon rules
...
DOCX Input: Support for the keepNext paragraph property to keep successive paragraphs on the same page.
VICE News by Adrian Tennessee
Rounded corners on the cross
Fix keyboard focus not going to cover grid after doing a search. Fixes #1369160 [post entering a search focus is on an element of the search result in default mode but on the search box in cover grid mode](https://bugs.launchpad.net/calibre/+bug/1369160)
Fix the row numbers in the book list remaining wide when switching libraries if some books were marked before the switch. Fixes #1369152 [Column width behaviour](https://bugs.launchpad.net/calibre/+bug/1369152)
Ensure there is never a double space after the title when creating file/folder names in the calibre library
Use a dictionary for color themes so we can add extra fields easily later
...
More color schemes for generated covers
Make ensure_app() thread-safe
Add a comment to generated cover's metadata so they can be easily identified