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
Add display of current maximum bitrate in the 'CodecInfo' overlay window.

Fixed the max bit rate value reset at the end of play.
Enlarged the size of the Confluence skin codec information window to accomodate the new information.
Added a log at the end of play printing some information about codec dropped frames behavior.

Conflicts:

	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp

Conflicts:

	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
Added indication of the version we are running in System > System info.
Added heat info and cpu usage info to the information screen in video player.

Display the info in Video OSD or in info window.
Updated the height of the upper fade area in show info.
Modified the fan speed display, to better manage the missing fan on the board (some HTPC don't have it, or don't have the speed measurement).
Added system fan speed to the CPU temperature label in system info window.
Added cpu speed info to the information screen in video player.
Fix size of display of current maximum bitrate in the 'CodecInfo' overlay window.

Conflicts:

	addons/skin.confluence/720p/VideoFullScreen.xml
Fix after b85b12f8cc0855e7d4d448886a4d60adeba7ce6e (kill CStdString)
[confluence skin] Changed behavior of DialogKaiToast info window: now scrolls the message text and wait only 500 ms before restarting scrolling
[xbmc] Changing the way the info window display time work: now it's depending on the message length (more characters leads to more seconds, 200 ms each character allocated), with a minimum of 2 seconds