Merge pull request #1982 from nemphys/sortandrenumber

[pvr] optimize channel groups loading/manipulation by avoiding unnecessary ...
Merge pull request #2004 from ronie/confluence-menu

[Confluence] Show Movies and TV Shows by default on home menu. Fixes #13839
escape backslashes in ESCINFO[]. fixes #13855
jsonrpc: check pointers before dereferencing in CPlayerOperations::GetItem() (fixes #13853)
[addons] sync addons with repo
[pvr] fixed - also update last watched status when opening the stream, so playback resumes on the correct channel and not the previous channel when xbmc crashes or is killed and is restarted (if the option is enabled)
[epg] fixed - don't trigger an update of the main window's data when showing epg info, or we'll switch back to the incorrect line. thanks @ forum user 'coffeecup'
[pvr] throttle connection attempts, no more than 1 attempt per 5 seconds
[lang] update of core language files
[lang] update of skin.confluence language files
[lang] update of internal addon language files
fixed: the auto-addition of '..' when the list is empty did not show up on filtered lists
remove unnecessary toast + parent folder of empty lists after filtering - the '..' item is shown, so this won't be hit anyway
[lang] added langinfo.xml for new language: Amharic
[pvr] bump add-ons to https://github.com/opdenkamp/xbmc-pvr-addons/commit/5f97406cffb412ac5161c3dc51205caca009fcc7
Merge pull request #2007 from jmarshallnz/dot_dot_dot

Show '..' items as we're supposed to in empty lists
use ALBUM ARTIST and ALBUMARTIST in ID3v2 TXXX fields as album artist
[pvr] allow pvr add-ons to be uninstalled again
[pvr] stop the pvr manager before uninstalling a pvr add-on and restart it afterwards (if enabled)
[pvr] fixed - (re)start the pvr manager when enabling a pvr add-on or when disabling one with the pvr manager enabled