Send books to the Books folder for the Tolino Vision
Update Frontline
Fix content server internal redirects not unquoting the category.

See http://www.mobileread.com/forums/showthread.php?t=236441 for some context.

Although the fix works, I am not sure that this is the right way to fix it. I am not familiar enough with the routing system to know if there is a single place somewhere that is missing the unquote.
Content server; Fix page not found error when clicking on a category that has only a single item in it

Merge branch 'master' of https://github.com/cbhaley/calibre
DOCX Input: Dont fail on DOCX files that contain pages with zero effective width. Fixes #1303022 [Private bug](https://bugs.launchpad.net/calibre/+bug/1303022)
Refactor HTML syntax highlighter too keep track of tag nesting

This is needed for the eventual implementation of inline spellcheck
Start work on managing dictionaries in calibre
...
Add ISO 3166 country codes
...
Implement loading of both builtin and user installed dictionaries
...
Start work on dialog to manage user installed dictionaries
...