[fix] only check video playlist status to determine fullscreen playback
Merge pull request #4619 from fritsch/aefixes

ActiveAE: correct time of buffered samples by resample ratio
Merge pull request #4626 from Voyager1/fix-trac15163

[fix] only check video playlist status to determine fullscreen playback
[confluence] change buttons to edit controls (see #4613)
[WIN32] fixed BuildSetup.bat after ffmpeg2 merge
Merge pull request #4499 from herrnst/remove-mp3codec

Drop MP3Codec/libmad from paplayer and dvdplayer in favor of FFmpeg
Merge pull request #4628 from wsoltys/fixbuildsetup

[WIN32] fixed BuildSetup.bat after ffmpeg2 merge
[JsonSchemaBuilder] remove JsonSchemaBuilder binary. Shame on my git foo
[narf] remove another binary not supposed to be there
Improved file buffering in CArchive.

CArchive already did some file buffering, but only on writes. Added the
equivalent code for reads. Also improved the write buffer case so that it
only ever issues sector-aligned writes (the read code does this from the
start). Shuffled various bits of code into the header file to squeeze a bit
more performance out of it.
Merge pull request #4624 from FernetMenta/paplayer

paplayer: dvdplayercodec - check if seek is possible before trying to se...
[bookmark] fix resume bookmark from a plugin:// of stack:// items, thanks to kit500
new icons for media folder
[webinterface] new favicon
[osx] new icons + create icon from the iconset
[upnp] make use of new icons and add additional sizes
[linux] make use of new icons

Conflicts:
	xbmc/windowing/X11/WinSystemX11.cpp
[droid] new launcher icons + fetch launcher icons from media dir
[cydia] - remote iconpack script - iconpack is not needed anymore - http://mirrors.xbmc.org/apt/pre-release/ios/CydiaIcon.png is used for it - should be replaced with media/iOS/rounded/AppIcon57x57.png
[ios] added new iOS icons