MP1-4329 : Allowed Standby Hours are no longer ignored
MP1-4341 : Add possibility to Deploy Tool to upgrade MySQL dB
MP1-4341 : Only perform MySQL upgrade on Singleseat or tvserver_master.
MP1-4341 : MySQL 5.1 fix backup db and uninstall clsid (MySQL 5.1 can have 2 different clsid) and add check if MySQL service is running.
MP1-4341 : show MySQL Upgrade page only when 5.1 is installed and when upgrade button is selected.
Merge remote-tracking branch 'remotes/origin/MP1-4329_Allowed_Standby_Hours_are_Ignored_by_PowerScheduler_Client_Plugin'
Fork : MP1-2441 : Fix assembly for Common.GUIPlugins
MP1-4341 : Cleanup code and change Wiki link.
MP1-2441 : Fix configure issue
Merge remote-tracking branch 'remotes/upstream/MP1-4341-REWORK-Add_possibility_to_Deploy_Tool_to_upgrade_MySQL_dB' into 1.6.0Fork-BDJ

Conflicts:
	Tools/MediaPortal.DeployTool/Sections/MySQLChoice.cs
	Tools/MediaPortal.DeployTool/Sections/MySQLChoice.designer.cs
Merge remote-tracking branch 'remotes/upstream/MP1-2441-FEAT-Add_WOL_feature_to_MediaPortal' into 1.6.0Fork-BDJ

Conflicts:
	mediaportal/WindowPlugins/Common.GUIPlugins/Common.GUIPlugins.csproj
	mediaportal/WindowPlugins/Common.GUIPlugins/Properties/AssemblyInfo.cs
Merge remote-tracking branch 'remotes/origin/MP1-4268-BUG-does_not_start_the_manual_recording_if_there_is_a_scheduled_recording'
Merge remote-tracking branch 'remotes/origin/MP1-4346-BUG-Fix_3D_movies_when_using_ViewModeSwitcher'
Merge remote-tracking branch 'remotes/origin/MP1-4327-BUG-Fast_switching_visualization_can_lead_to_crash'
Merge remote-tracking branch 'remotes/upstream/master' into 1.6.0Fork-BDJ

Conflicts:
	mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs