Check for existing deploy.xml and attempt to delete
Updated property in mediaportal.xml and added code to remove old value on upgrade
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1 into FEAT-3695-Rework_BASS_implementation

Conflicts:
	mediaportal/Configuration/MediaPortal.Configuration.csproj
remove orig file commited per mistake
Merge branch 'FEAT-3695-Rework_BASS_implementation' of https://github.com/MediaPortal/MediaPortal-1 into FEAT-3695-Rework_BASS_implementation
Removed further obsolete settings entries
Merge branch 'FEAT-3695-Rework_BASS_implementation' of http://github.com/MediaPortal/MediaPortal-1 into FEAT-3695-Rework_BASS_implementation
Only update MusicTag where data exists in database
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music
Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into BUG_3943_Playlists_not_showing_tags
Merge branch 'BUG_3943_Playlists_not_showing_tags'
Fixed Mantis issue: 4354: Unable to start MediaPortal on old Intel GPUs

Added D3D CreateFlags selection based on the GPU capabilities
Always log used display for main form
Update to ensure skin choice is set by default not just after button click (ie. accepting default values was not always being reflected downstream)
Removed call to SetBounds in WM_GETMINMAXINFO
Reverted removal of SetBounds in WM_GETMINMAXINFO
Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into FEAT-3695-Rework_BASS_implementation
Merge branch 'FEAT-3695-Rework_BASS_implementation'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music

Conflicts:
	mediaportal/Configuration/SettingsUpgradeManager.cs
	mediaportal/Core/Player/PlayerFactory.cs
Merge remote-tracking branch 'remotes/upstream/BUG-4354-Unable_to_start_MediaPortal_on_old_Intel_GPUs' into 1.3Final_ADDON3_TV_Music