Fixed incorrect include filename
Cleaned up previous attempt to resolve conflict
Merge branch 'EXP-4223-Add_Windows_8_as_Fully_Supported_OS'
Merge remote-tracking branch 'remotes/origin/BUG-4216-MP_has_problems_accessing_the_tv_server_database_on_fresh_installation'
Playback event handlers were being registered by last.fm radio plugin when it was not enabled.
This caused null reference exceptions.
Moved event handler registration from constructor to Init so they are only registered when the plugin is enabled
Fix missing OSD when using skip steps in Default skin (mantis #4236)

Fix by catavolt, thanks!
Merge branch 'BUG-4236_No_OSD_for_skip_steps_in_default'
Merge remote-tracking branch 'origin' into FEAT_Last.fm_API_2.0

Conflicts:
	mediaportal/Configuration/SettingsForm.cs
Merge remote-tracking branch 'remotes/upstream/master' into 1.3.0RC_SEB_ADDONV3_HomeY
Merge remote-tracking branch 'remotes/upstream/FEAT_Last.fm_API_2.0' into 1.3.0RC_SEB_ADDONV3_HomeY

Conflicts:
	mediaportal/Configuration/SettingsForm.cs