Confluence: fix default EPG background color for PVR addons that only use genre strings
(GenreType = 0x100)
factor out the UI scaling computation from SetScalingResolution
use GetGUIScaling rather than SetScalingResolution when computing font size so as to not alter stored state
[pvr] bump add-ons (missing stubs in nextpvr)
[fix] adds missing m_bIsRadio property to operators in CPVRTimerInfoTag
addongui: fix incorrect version in header
[Fix][Util] Fix format of external subtitles' name (including empty name).
Input: Scan for joysticks that are keyboards to workaround kernel bug, see: 1560550480302e4768d1e183f038b709dd5a52fd
[osx/gtest] - fix linkage of xbmc-test binary (ffmpeg now needs expliciti linkage agaoinst framework VDA, and some new source files were missing in the makefiles)
[osx] - fix cmdline linkage of lixbmc.so and xbmc.bin - there is no circular dependency linker option on osx (e.x. -Wl,--start-group/--end-group) - so we still need to link in main.a for osx.
dvdplayer: fix segfault in GetAudioStreamInfo
pvr: do not ignore scene markers for edl
omxplayer: fix segfault in GetAudioStreamInfo
settings: move settings library files into xbmc/settings/lib
[win32] update VS project files
[oxs/ios/atv2] xcode changes
Merge pull request #3627 from ace20022/ext_subs_label

[Fix][Util] Fix format of external subtitles' name
Merge pull request #3628 from fritsch/microsoft-js

Input: Scan for microsoft keyboard which have a kernel bug
Merge pull request #3622 from opdenkamp/pvr19addonfix

[pvr] bump add-ons (missing stubs in nextpvr)
Merge pull request #3624 from xhaggi/fix-pvrtimerinfotag

[fix] adds missing m_bIsRadio property to operators in CPVRTimerInfoTag