Merge remote-tracking branch 'remotes/origin/master' into MP1-2803-Upgrade_to_MySQL_5_6_and_use_InnoDB_as_default_MySQL_engine

Conflicts:
	Tools/InstallationScripts/include-MP-PreBuild.nsh
Merge remote-tracking branch 'remotes/origin/master' into MP1-4248-FEAT-Add_acces_to_Framegrabber_for_3rd_plugins_Atmolight
Merge remote-tracking branch 'remotes/origin/master' into MP1-4239-BUG-Autorepeat_for_MCE2005_ChannelUp_Down_buttons
Merge remote-tracking branch 'remotes/origin/master' into MP1-4251-BUG-Updated_BassVis_DLLs
Merge remote-tracking branch 'remotes/origin/master' into MP1-4235-FEAT-Auto3D_plugin_support_for_MediaPortal

Conflicts:
	mediaportal/MediaPortal.Application/MediaPortal.cs
Merge remote-tracking branch 'remotes/origin/master' into MP1-4237-BUG-Fix_for_COM_port_blocked_by_RemoteRedEye_and_RemoteSerialUIR_plugins
Merge remote-tracking branch 'remotes/origin/MP1-4248-FEAT-Add_acces_to_Framegrabber_for_3rd_plugins_Atmolight'
Merge remote-tracking branch 'remotes/origin/MP1-4237-BUG-Fix_for_COM_port_blocked_by_RemoteRedEye_and_RemoteSerialUIR_plugins'
Merge remote-tracking branch 'remotes/origin/MP1-4251-BUG-Updated_BassVis_DLLs'
Merge remote-tracking branch 'remotes/origin/MP1-4239-BUG-Autorepeat_for_MCE2005_ChannelUp_Down_buttons'
Merge remote-tracking branch 'remotes/origin/MP1-4252-BUG-Win_8.1_DPI_scaling_issue_MP_resizes_to_partial_window'
Merge remote-tracking branch 'remotes/origin/MP1-2803-Upgrade_to_MySQL_5_6_and_use_InnoDB_as_default_MySQL_engine'
Merge remote-tracking branch 'remotes/origin/MP1-4235-FEAT-Auto3D_plugin_support_for_MediaPortal'

Conflicts:
	mediaportal/MediaPortal.Application/MediaPortal.cs
Merge remote-tracking branch 'remotes/upstream/master' into 1.5.0Fork

Conflicts:
	mediaportal/MediaPortal.Application/MediaPortal.cs