Add the path of an album or song to the get thumb "browse for art" dialog.
[Confluence] Don't process subsequent onclicks if the first one was cancelled. Fixes #13576
[Confluence] get rid of error log messages
[release] version bump to 13.0 alpha1 as we start new merge windows.
paplayer handle prepare stream failure.
Merge pull request #2108 from MartijnKaijser/grAEKen_master

[release] version bump to 13.0 alpha1 as we start new merge windows
Merge pull request #2021 from ronie/confluence-subs

[Confluence] Don't process subsequent onclicks if the first one was cancelled
Merge pull request #1922 from ace20022/browse_for_art_music

[art] Add the album/song path to the get thumb "browse for art" dialog
Merge pull request #2129 from ulion/paplayer_prepare_stream_failure

paplayer handle prepare stream failure.
Merge pull request #2120 from ronie/confluence-onclick

[Confluence] get rid of error log messages
Merge remote-tracking branch 'origin/master' into android-neon-xaf-touch

Conflicts:
	addons/skin.confluence/720p/DialogAlbumInfo.xml
	addons/skin.confluence/720p/DialogVideoInfo.xml
	addons/skin.confluence/720p/MyWeather.xml
	addons/skin.confluence/720p/SkinSettings.xml
	addons/skin.confluence/720p/VideoOSD.xml
	addons/skin.confluence/720p/script-globalsearch-main.xml
	addons/skin.confluence/720p/weather/10DayForecast.xml
	addons/skin.confluence/720p/weather/HourlyForecast.xml
	media/Splash.png