Fixed typo in diagnostic
Merge branch 'master' of https://github.com/kovidgoyal/calibre
Content server: Use internal redirect for single item categories

Content server: Fix single item categories not working with reverse
proxy setup. Fixes #1238987 [Calibre behind apache server sometimes returns 'localhost' URLs](https://bugs.launchpad.net/calibre/+bug/1238987)

Single item categories were using HTTP 303 redirects which are resolved to
http://localhost:8080 absolute URLs by cherrpy (since cherrypy has no
knowledge of whatever server the apache process is exposed as). SO
instead we use an internal redirect, which does not suffer from this
issue. It does mean that bookmarking the URL wil have unexpected
side-effects if the number of items in the catefory ever increases to
more than one.
HTMLZ Output: Various fixes

HTMLZ Output: Fix <style> tag placed inside <body> instead of <head>.
See #1239530 (Htmlz conversion places <head> in <body>, not before)

HTMLZ Output: Fix inline styles not escaping quotes properly. See #1239527 (Htmlz inline css doesn't single quote fonts & thus destroys html)

HTMLZ Output: Fix incorrect handling of some self closing tags like
<br>. See #1239555 (Htmlz conversion incorrectly handles <br/>)

Merge branch 'master' of https://github.com/user-none/calibre
Update cracked.com
Edit metadata dialog: Fix incorrect size on multi-screen setup

Edit metadata dialog: The dit metadata dialog currently limits its max
size based on the geometry of the smallet attached screen. Change that
to use the geometry of the screen on which it will be shown.
Fixes #1239597 [metadata window height not remembered](https://bugs.launchpad.net/calibre/+bug/1239597)
...
Allow using textures for cover grid background

Cover grid: Allow using images as the background for the cover grid. To
choose an image, go to Preferences->Look & Feel->Cover Grid. Fixes #1239194 [[Ideas] -->book grid](https://bugs.launchpad.net/calibre/+bug/1239194) [[Ideas] -->book grid](https://bugs.launchpad.net/calibre/+bug/1239194)

The builtin textures come from subtlepatterns.com
Fix removal of textures not working

Also credit subtlepatterns in the texture chooser dialog.
Hook up global undo/redo
Update Wired Magazine
Update Wall Street Journal

See #1239477 (Private bug)
Implement saving of main window state and quit action
Use same code for initializing CC comments editor as for builtin comments editor
Properly initialize standalone comments editing box
Move join_with_timeout into the utils module
Start work on saving
Saving implemented
...
Confirm on quit if unsaved changes present