Merge branch 'master' into EXP-MyVideos_Cache_and_FileWatcher_Implementation
Merge remote-tracking branch 'remotes/origin/master' into MP1-4068_MyVideos_Cache_and_FileWatcher_Implementation

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