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
addongui: fix incorrect version in header
[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.
pvr: do not ignore scene markers for edl
[rbp/omxplayer] Ignore speaker layout for analogue

Although speaker configuration options are only visible for hdmi,
the code still uses them after switching back to analogue
resulting in bad audio.
[darwin] - add missing autorelase pool (seen when playing with gtest ;) ).
dvdplayer audio: fix no audio on resume
[darwin] - fix - current audio device wasn't shown in the ui. Something broke this recently - i wasn't able to figure out which commit it was. But i verified that it is working with the generic approach - no need to do special stuff for darwin.
[xcode] - another xcode nothing change...
[osx/sdl] - fix possible NPE - fixes #14676
[darwin/settings] - hide one more unused option for darwin
Merge pull request #3641 from FernetMenta/dvdaudio

dvdplayer audio: fix no audio on resume
[cstdstring] add format functions for working with wstring/wchar_t
[cstdstring] demise Format, replacing with StringUtils::Format
[cstdstring] remove CStdString::Empty and replace with std::string::clear
[cstdstring] remove IsEmpty() and replace with empty()
Merge pull request #3591 from margro/gotham_epg_missingcolor

[Confluence] fix default EPG background color for genre strings