Merge remote-tracking branch 'kovid/master'
Merge remote-tracking branch 'kovid/master'
Book polishing: Fix publisher field in epub not being cleared when updating metadata. Fixes #1319732 [calibre will not update Publisher](https://bugs.launchpad.net/calibre/+bug/1319732)
Fix null fields not being cleared when updating metadata before edit book.
Kobo driver: Update to handle changes to annotation processing in newer Kobo firmware.

The changed contentIds for kepubs meant not all annotations were being
retrieved. This also meant that some annotations would be out of order.
Fixes #1319819 [Annotations for kepubs now use different contentIds](https://bugs.launchpad.net/calibre/+bug/1319819)
version 1.37
...
...
Add CSIDL_PROFILE constant
A more complete fix for non ascii usernames on windows when using the export file dialog. See #1298071 ([Edit book]: Crash exporting image)
Make ExclusiveFile thread safe on Unix (use flock instead of lockf)
...
Edit Book: Fix an error when running the Check Book tool on files with empty <style> tags. Fixes #1320459 [Private bug](https://bugs.launchpad.net/calibre/+bug/1320459)
Add .ibook*s* as a recognized ebook format as well
Start work on Live CSS view
Dont show an error message when trying to use quick open with no book open
Update Instapaper
Preview panel: Improve robustness of resource loading from the book

Ensure that resources are always loaded from the current container, even
if the current container was changed since the base URL was specified.
While this is unlikely to happen, it is best to be robust.
Implement code to retrieve style information for the Live CSS panel
Handle media queries when finding matching CSS rules