Make the shortcut config widget a little more robust by not relying on QKeyEvent::text()
Merge branch 'master' of https://github.com/cbhaley/calibre
Add an explicit hide() for the edit metadata dialog, though I dont see why it should be necessary. Maybe it will fix the phantom edit metadata dialog problem.
...
Workaround for Qt 5 regression causing custom colors in color chooser dialogs to not be remembered between calibre sessions
Driver for HTC C. Fixes #1360678 ['Send To Device' icon not appearing](https://bugs.launchpad.net/calibre/+bug/1360678)
Output busnum and devnum when failing to open mtp device
More general fix for the OS X keyboard shortcuts not working problem.  Fixes #1360849 [m command to merge books no longer functions](https://bugs.launchpad.net/calibre/+bug/1360849)

Add all actions created using the create_action/create_menu_action API
directly to the main window this allows their shortcuts to work on OS X.
Just in case libusb's busnum and devnum are not unique on OS X
When applying column header state explicitly change section hidden for every column not just the ondevice column
Replace deprecated __defineGetter__ and __defineSetter___

__defineGetter__ was not working in Qt 5, this caused the following
regressions:

PDF Output: Header and footer templates not working in calibre 2.0.
Fixes #1361483 [Headers and footers don't appear EPUB to PDF](https://bugs.launchpad.net/calibre/+bug/1361483)

E-book viewer: The Table of Contents not displaying the currently viewed
section in bold if the section is a link to a location in the middle of
a file.
Change the "emblem" preference stuff so that the template editor does not show the icon type fields.