replace header background image - thanx uNiversal
Merge pull request #3971 from ronie/confluence-readability

replace header background image
update Touched skin
[Confluence] fix non-intuitive navigation
[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
[Confluence] small dialog - part2
[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)
Merge pull request #3981 from FernetMenta/aefixes

ActiveAE: remove group transitions from CONFIGURED to CONFIGURED_PLAY, f...
Fix Mime parsing after 99c85944d83bb257c8056bbadd02b5fdb0e574b9
Move MIME-type detection from class CFileUtils to right class CMime
Mime::parseMimeType: simplify parsing code
Mime: add detection of basic types by file content
ScraperUrl::Get: Better detect archives and report result of unpacking
[ios] fixed, drop org.xbmc.xbmc-iconpack dependancy
Merge pull request #3986 from Karlson2k/fix_mime_01

Fix archive processing by ScraperUrl after 872de5f2fb21d155a0c1a51d7aadf8a70133cbe4
Merge pull request #3991 from amet/drop_iconpack_ios

[ios] fixed, drop org.xbmc.xbmc-iconpack dependancy
dvdplayer: clear packets for decoder recovery when opening a new decoder