demuxer ffmpeg, workaround for broken probing of flac format
Merge pull request #4663 from FernetMenta/paplayer

demuxer ffmpeg, workaround for broken probing of flac format
FIX: [rtmp] do not hardlink librtmp
bump to Gotham 13.1 beta1
Merge pull request #4678 from koying/fixdroidrtmp

FIX: [rtmp] do not hardlink librtmp
[music] fix albumartist being used as a filter in song smartplaylists
Merge pull request #4680 from MartijnKaijser/13.1_b1

13.1 b1
Merge pull request #4664 from Montellese/broken_checks

fix broken comparisons
Conflicts:
	xbmc/settings/windows/GUIControlSettings.cpp
[linux] bad boolean type given to dbus
bump to Gotham 13.1 beta2
deinitialize CAnnouncementManager before stopping all (network) services

partial backport of e2693c5cb5320cede4d4dd884059c4574366eef1 and b348974a3fd13d3bd6d02e308037b0862f4c8ea0.
Re-factored FileItem to support IsResumePointSet() and GetCurrentResumeTime()
Re-factored FileItem to retrieve fresh resume data for recordings from the PVR server
Re-factored GetResumeString to not insert a bookmark in the video db, it is never used
Merge pull request #4630 from Red-F/gotham-resume-pvr-lastplayedposition

FIX resume playing PVR recordings from the exact lastplayed position
Merge pull request #4695 from Memphiz/badaccess

[airplay] - fix possible bad access as reported in
[upnp] properly hide the addons node
Merge pull request #4730 from Montellese/gotham_announcement_fix

deinitialize CAnnouncementManager before stopping all (network) services
Merge pull request #4700 from MartijnKaijser/13.1b2

13.1b2
[release] version bump to 13.1 rc1