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

replace header background image
update Touched skin
[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
[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...
videoplayer: adapt lateness detection and dropping to buffering
video player: present correct pts to user for a/v sync (after buffering in renderer)
videoplayer: some rework and documentation
renderer: bump buffers to 5
videoplayer: update frametime, it might change due to fps detection
videoplayer: give streams with invalid fps a chance for fps detection
dvdplayer: allow rewinding at end of stream, do a seek after rewind
X11: ditch SDL for video and window events
X11: Add xbmc icon
X11: add SDL joystick until we have a better solution
X11: factor out code handling device reset notification