Merge pull request #5258 from koying/droidsplash

CHG: [droid] Splash.java: check sdcard readyness + refactor
Merge pull request #5373 from Memphiz/osx_dns2

[osx] - get secondary DNS
Merge pull request #5348 from Phaeodaria/tegra-omx-pr

[OMX] Revive OMX backend for Tegra
Merge pull request #5327 from da-anda/keymap-handling

[PVR][input] allow custom keymaps also for PVR radio
Merge pull request #5188 from tamland/disc-number-cleanup

Refactor disc number methods
Merge pull request #5236 from da-anda/3D-ux-fixes

[3D] usability fixes and cleanup
Merge pull request #5392 from ace20022/cast_coord

[bluray] Cast click coordinates from float to uint16_t.
[pvr] fix deviations of selected item between PVR windows and channel OSD

As discussed in our forum (http://forum.xbmc.org/showthread.php?tid=175135&pid=1795411#pid1795411) this fix the deviations of the selected item between the PVR windows and the channel osd.

I also changed the way the current playing channel is used for the selected item. It's only used if we never have valid selected item or if we switch the channel otherwise we use the stored selected item. Thanks Jönke for this suggestion.
[osx] - update readme - we support Xcode 6.0.1 against 10.9 SDK
Merge pull request #5399 from FernetMenta/ssa

dvdplayer: adapt matroshka ssa subs to ffmpeg 2.4 api change
Make up missed ShowPicture in command array
[Cleanup] Remove not working stereo to mono split mode/setting.

Conflicts:
	xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
[pvr] cosmetics: correct wrong code format
[pvr] fix wrong printf format mismatch
dvdplayer: fix flushing message queue
Merge pull request #5027 from ace20022/rem_stereo_to_mono

[Cleanup] Remove broken stereo to mono split mode/setting.
Merge pull request #5405 from xhaggi/pvr-fix-printf-format-mismatch

[pvr] fix wrong printf format mismatch
[win32][vfs] Add CWin32SMBFile class for files on SMB shares for win32
[win32][vfs] FileFactory: switch to new implementation of Win32SMBFile
[win32] Remove old WINFileSMB and WINSMBDirectory