[Fix] CStreamDetailSubtitle::IsWorseThan claimed to consider the user's preferred language but actually didn't.
[Confluence] smaller select dialog when button is not visible
ActiveAE: update buffered time of streams on resume after suspend
[confluence] epg: adds genre to timeline info area
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
Merge pull request #3975 from FernetMenta/aefixes

ActiveAE: update buffered time of streams on resume after suspend
replace header background image - thanx uNiversal
Merge pull request #3971 from ronie/confluence-readability

replace header background image
update Touched skin
ActiveAE: remove group transitions from CONFIGURED to CONFIGURED_PLAY, fixes unwanted transition from SUSPEND to PLAY
[rbp/omxplayer] Fix stall when resuming avi file without valid pts

Revert it for now until a better solution is found.
Merge pull request #3983 from popcornmix/revert_unknown_start

[rbp/omxplayer] Fix stall when resuming avi file without valid pts
ActiveAE: fix potential issue when remapping channels, only relevant for codecs like ogg
[ios/tvout] - remove the none working try to move back to internal display when we are on tvout and someone pulls the tvout adapter from the device. This was never really working, it resulted in wrong framebuffersize when tv/amp was switched off and on (fireing connect/disconnect messages) on retina devices and isn't a real important use case (cable unpluggers can restart XBMC without an issue)
[pvr] fix: syntax error in sql statement (duplicate AND)
Merge pull request #3987 from xhaggi/fix-sql-syntax

[pvr] fix: syntax error in sql statement (duplicate AND)