Fixed typo(?) in set_metadata() for touched files.
Move User Manual and staging to the download server
Fix cc bug in template editor

Fix an error when using the Template Editor to create a template that
uses custom columns. Fixes #1193763 [Private bug](https://bugs.launchpad.net/calibre/+bug/1193763)
On book merge, merge identifiers as well. In case of conflict, the target wins.
Merge branch 'merge-identifiers' of https://github.com/hakan42/calibre

When auto-merging books on add, also merge identifiers.
...
...
Conversion: Add option to embed all referenced fonts

Conversion: Add an option to embed all fonts that are referenced in the
input document but are not already embedded. This will search your
system for the referenced font, and if found, the font will be embedded.
Only works if the output format supports font embedding (for example:
EPUB or AZW3).
AZW3 Input: Add support for page-progression-direction

AZW3 Input: Add support for the page-progression-direction that is used
to indicate page turns should happen from right to left. The attribute
is passed into EPUB when converting. Fixes #1194766 [Incorrect conversion japanese MOBI](https://bugs.launchpad.net/calibre/+bug/1194766)
PDF Output: Fix add ToC option not being used

PDF Output: Fix Table of Contents being added tot he end of the PDF even
without the Add Table of Contents option being enabled. Fixes #1194836 [When convert to PDF, it always create TOC at the end](https://bugs.launchpad.net/calibre/+bug/1194836)
Save dist file sizes for bandwidth calculation

Also fix a typo in copying dist files to tdir and backup.
Add notes on provisioning a file hosting server
ToC Editor: Use filenames when generating from files

ToC Editor: When generating a ToC from files, if the file has no text,
do not skip it. Instead create an entry using the filename of the file.
Log the wait before sending email

When waiting before sending email, log the wait. Fixes #1195173 [Feature Request - Multiple books emailed to device](https://bugs.launchpad.net/calibre/+bug/1195173)
...
pep8
...
...
pep8
ebook-convert: Add option to read metadata from OPF