[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
Merge remote-tracking branch 'origin/master' into android-tegra2-xaf-touch

Conflicts:
	addons/skin.confluence/720p/DialogButtonMenu.xml
	addons/skin.confluence/720p/ViewsFileMode.xml