Merge branch 'master' of https://github.com/t3d/calibre
Edit book: If the book being edited is deleted instead of showing an error message on save, ask the user to choose a new file location before saving.
PDF metadata: When both Info and XMP metadata present resolve which one ot use based on modification timestamps
Turn off default shortcuts for checkpoints on os x since they interfere with editing because of a bug in Qt
Fix fallback filename pattern not matching filenames from the calibre library
...
Edit book: Fix splitting of HTML file occurring at the wrong location if the HTML contains invalid constructs like nested <p> tags
...
Add malformed markup check when editing ToC as well
...
Fix bookstores to account for website changes. Remove Foyles because their search now uses ajax (complicated), and no one ever buys from that store anyway.
Skip sanitizing in comments editor when special <meta> tag detected.
Maintenance on various Get Books plugins and remove the Foyles UK store

Merge branch 'master' of https://github.com/cbhaley/calibre
Allow disabling of comment sanitizing in the comments editor via a special meta tag <meta name="calibre-dont-sanitize">

Merge branch 'master' of https://github.com/GRiker/calibre
squash bugs originating from HEAD
add articles' descriptions and dates