Merge remote-tracking branch 'upstream/master'

Conflicts:
	SEModAPIExtensions/API/ChatManager.cs
	SEModAPIExtensions/Properties/AssemblyInfo.cs

	SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlock/ProductionBlockEntity.cs
	SEModAPIInternal/Properties/AssemblyInfo.cs
	SEServerExtender/Properties/AssemblyInfo.cs