Merge remote-tracking branch 'remotes/origin/MP1-2469-DetectDrive_method_obsolete'
Merge remote-tracking branch 'remotes/origin/MP1-4068_MyVideos_Cache_and_FileWatcher_Implementation'

Conflicts:
	mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoFiles.cs
Merge remote-tracking branch 'remotes/upstream/master' into 1.4.0Fork_SEB_New_Master

Conflicts:
	mediaportal/MediaPortal.Application/MediaPortal.cs
	mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs
	mediaportal/WindowPlugins/GUIPictures/GUIPictures.cs
	mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoFiles.cs