[vfs] CFile: remove 'virtual' from destructor
no class is derived from CFile
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.
[confluence] replace subtitle flag icons with new ones

As discussed in #3552, this replace the subtitle flag icons with new
32x32 pixel icons from https://www.gosquared.com/resources/flag-icons/

This also fixes some wrong flags like uk. It's Ukrainian not United
Kingdom.
[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
[cstdstring] adds CWIN32Util::WUSysMsg
[cstdstring] replace WUSysMsg with CWIN32Util::WUSysMsg
[cstdstring] remove FormatV and replace with StringUtils::FormatV
[cstdstring] refactor CPartyModeManager::GetWhereClauseWithHistory
[cstdstring] refactor CUtil::RunCommandLine