[Fix] CStreamDetailSubtitle::IsWorseThan claimed to consider the user's preferred language but actually didn't.
[Confluence] smaller select dialog when button is not visible
[configure/airtunes] - fixed typo
[configure/airtunes] - fix fallback to libshairport if libshairplay can't be found. Bail out if --enable-airtunes was given and none of both libs was found.
[confluence] epg: adds genre to timeline info area
Merge pull request #3972 from Memphiz/fixshairportfallback

[configure/airtunes] - fix the fallback to libshairport if libshairplay can't be found...
Revert "[WIN32] changed: use up to 4 parallel msbuild workers."

This reverts commit 162347f2b027ad7b333c5864a4153c5ece7c754f.

This change works fine if the windows vm is the only one compiling. Since the recent build logs showed a longer compile time when doing builds for all platforms I'll revert this for now to see if it was the culprit.
[lang] fix: default to 3 days in description of setting
epg.daystodisplay
Merge pull request #3977 from xhaggi/fix-epg-lang-key

[lang] fix: default to 3 days in description of setting epg.daystodisplay
[pvr] fix: epg data limited to 8 days although 14 days are supported
Merge pull request #3974 from xhaggi/epg-max-blocks

[pvr] fix: epg data limited to 8 days although 14 days are supported
Merge pull request #3970 from ronie/confluence-select

[Confluence] smaller select dialog when button is not visible
Merge pull request #3973 from xhaggi/epg-genre-in-info-area

[confluence] epg: adds genre to timeline info area
[DROID][AE] Fix 250ms audio delay on AML devices
[DROID] Fix listing android apps.

Android apps don't require the network, so don't wait for it to list
them.
Merge pull request #3945 from ace20022/sdsub

[Fix] Subtitle case of CStreamDetails::DetermineBestStreams
replace header background image