Merge branch 'master' of https://github.com/cbhaley/calibre

Fixes #1359356 ["Series" in plural in template editor](https://bugs.launchpad.net/calibre/+bug/1359356)
...
...
...
...
Fix regression in 2.0 that broke viewing of LRF format ebooks. Fixes #1360332 [Impossible to read a lrf document](https://bugs.launchpad.net/calibre/+bug/1360332)
Edit Book: Workaround for Qt 5 regression that caused the "See what changed" tool to freeze the editor when closing the window showing the changes.
Fix move to .txz for linux binaries causing links on the previous releases page for linux binaries not working
Book polishing: Fix EPUB files with corrupted ZIP central directories not working and leaving behind detritus in the current working directory. Fixes #1360385 [Debris left when polish books fails](https://bugs.launchpad.net/calibre/+bug/1360385)
Edit book: Workaround for regression in Qt 5 that causes typing the Cmd+some letter to generate text in the editor instead of being ignored.

https://bugreports.qt-project.org/browse/QTBUG-40933
Note about Qt 5 vs. Windows XP
E-book viewer: Fix Table of Contents open state not being remembered when the remember window size setting is disabled
E-book viewer: Fix a regression in 2.0 that changed the speed of scrolling with the mouse wheel in flow mode
Use the full formatter for the catalog templates so the full template language and all custom columns can be used.

I have tested this in epub and mobi and it works as far as I can tell. Unfortunately this code is very complicated so there may be problems. We will see...