[release] bump version to RC3
Lock/UnLock synchronization
[confluence] change "wide icons" view naming to "wide". Fixes #13485
[confluence] add 'Bluray Disc' flag to be displayed instead of empty space. Fixes #11718
Merge pull request #2013 from stupid-boy/master

[rbp/omx] fixed propper lock/unlock in omclock
Merge pull request #2014 from MartijnKaijser/fix_ticket_13485

[confluence] change "wide icons" view naming to "wide".
Merge pull request #2015 from MartijnKaijser/fix_11718

[confluence] add 'Bluray Disc' flag to be displayed
[Confluence] Use 'shutdown function' setting in 'custom shutdown timer'. fixes #12848
Merge pull request #2017 from ronie/confluence-shutdown

[Confluence] Use 'shutdown function' setting in 'custom shutdown timer'. fixes #12848
Merge pull request #2010 from MartijnKaijser/version_bump_rc3

[release] bump version to RC3
parse id3v1 tags of mp3 files
compilations node in the music library returned all albums, rather than just compilation albums. fixes #13825 #13825. Thanks to Xycl.
[rbp/omxplayer] fixed subtitle display time. fixes #13861
don't allow a job with id 0 (will be used for invalid job id)
if the job manager isn't running, don't add new jobs
progress control with reveal set to true didn't update correctly with dirty regions set to 1. fixes #13887
use a helper function to retrieve the CPluginDirectory instance from the handle, thanks to ulion
use a map instead of a vector for holding plugin handles - ensures that we don't attempt to access the wrong one if an earlier handle was removed. Thanks to ulion for finding the issue
Merge branch 'master' into master-dev

* master:
  use a map instead of a vector for holding plugin handles - ensures that we don't attempt to access the wrong one if an earlier handle was removed. Thanks to ulion for finding the issue
  use a helper function to retrieve the CPluginDirectory instance from the handle, thanks to ulion
  progress control with reveal set to true didn't update correctly with dirty regions set to 1. fixes #13887
  if the job manager isn't running, don't add new jobs
  don't allow a job with id 0 (will be used for invalid job id)
  [rbp/omxplayer] fixed subtitle display time. fixes #13861
  compilations node in the music library returned all albums, rather than just compilation albums. fixes #13825 #13825. Thanks to Xycl.
  parse id3v1 tags of mp3 files
  [Confluence] Use 'shutdown function' setting in 'custom shutdown timer'. fixes #12848
  [confluence] add 'Bluray Disc' flag to be displayed instead of empty space. Fixes #11718
  [confluence] change "wide icons" view naming to "wide". Fixes #13485
  Lock/UnLock synchronization
  [release] bump version to RC3
Merge branch 'master-dev' into master-dev-tegra2

* master-dev:
  use a map instead of a vector for holding plugin handles - ensures that we don't attempt to access the wrong one if an earlier handle was removed. Thanks to ulion for finding the issue
  use a helper function to retrieve the CPluginDirectory instance from the handle, thanks to ulion
  progress control with reveal set to true didn't update correctly with dirty regions set to 1. fixes #13887
  if the job manager isn't running, don't add new jobs
  don't allow a job with id 0 (will be used for invalid job id)
  [rbp/omxplayer] fixed subtitle display time. fixes #13861
  compilations node in the music library returned all albums, rather than just compilation albums. fixes #13825 #13825. Thanks to Xycl.
  parse id3v1 tags of mp3 files
  [Confluence] Use 'shutdown function' setting in 'custom shutdown timer'. fixes #12848
  [confluence] add 'Bluray Disc' flag to be displayed instead of empty space. Fixes #11718
  [confluence] change "wide icons" view naming to "wide". Fixes #13485
  Lock/UnLock synchronization
  [release] bump version to RC3