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
Added CPVRRecording::GetAndCacheLastPlayedPosition(), this gets the last played position from the PVR Server and updates the recording's resume point
GUIWindowPVRRecordings will now update the PVRRecording resume point;
FileItem is extended with IsResumePointSet() and GetCurrentResumeTime();
Application::PlayFile will now use GetCurrentResumeTime() when IsResumePointSet() returns true.