MP1-4426 : Allow_to_display_folder.jpg_with_PIN_protection (regeszter patch)
Merge remote-tracking branch 'remotes/origin/MP1-4426-Allow_to_display_folder.jpg_with_PIN_protection'
Merge remote-tracking branch 'remotes/upstream/master' into 1.7.0Fork-BDJ

Conflicts:
	mediaportal/Core/Util/VirtualDirectory.cs