Add the ability to fetch the user categories for a book to proxy metadata. Add a formatter function to use it.
Revert "Add the ability to fetch the user categories for a book to proxy metadata. Add a formatter function to use it."

This reverts commit 29e29fdd3fb1d40fbb2398970b6be2360e52dc0e.
Alternate implementation that makes the decision about composite columns in user_categories_for_books().
Fix #1385384 [Little typo](https://bugs.launchpad.net/calibre/+bug/1385384)
Update FAZ net
Confirmation dialog: Rewrite getting rid of the use of Qt Designer. Now works with any sized icon images.
Template language: New function user_categories() to return the list of User Categories for a given book (only works in the GUI).

Merge branch 'master' of https://github.com/cbhaley/calibre
Remove other changes, leaving the fix for the formatter function.
Merge branch 'master' of https://github.com/cbhaley/calibre
Update Countryfile.com
Fix text entry widgets' popup completion window not working well with windows on-screen keyboard. Fixes #1385586 [Autosuggest in text fields eats keystrokes from On-Screen Keyboard on Windows](https://bugs.launchpad.net/calibre/+bug/1385586)
Proper fix for closing completion popups when clicking on the drop down arrow of comboboxes that does not conflict with windows on-screen keyboard
Fix text in standard buttons not being translated because of a change in Qt 5.3
...
Check Book: Silence incorrect warning about guide references to cover image in azw3 format
Fix #1385766 [Little typo](https://bugs.launchpad.net/calibre/+bug/1385766)
Fix #1385769 [Little typo?](https://bugs.launchpad.net/calibre/+bug/1385769)
Linux: Force use of GNOME button layout for dialogs when running under the GNOME, UNITY or MATE desktop environments
...
...