TortoiseGit setup commit
Merge branch 'master' of github.com:se5a/Pulsar4x

Conflicts:
	Pulsar4X/Pulsar4X.Lib/Entities/Components/BeamFireControlTN.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Components/BeamTN.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Components/CIWSTN.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Components/OrdnanceTN.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Components/TurretTN.cs
	Pulsar4X/Pulsar4X.Lib/Entities/GameEntity.cs
	Pulsar4X/Pulsar4X.Lib/Entities/JumpPoint.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Orders.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Planet.cs
	Pulsar4X/Pulsar4X.Lib/Entities/Ship.cs
	Pulsar4X/Pulsar4X.Lib/Entities/SimEntity.cs
	Pulsar4X/Pulsar4X.Lib/Entities/StarSystemEntity.cs
	Pulsar4X/Pulsar4X.Lib/Entities/TaskGroup.cs
	Pulsar4X/Pulsar4X.Tests/ShipTests.cs
	Pulsar4X/Pulsar4X.UI/Handlers/ClassDesign.cs
	Pulsar4X/Pulsar4X.UI/Helpers/ResourceManager.cs
	Pulsar4X/Pulsar4X.UI/Panels/ClassDes_Options.Designer.cs
	Pulsar4X/Pulsar4X.UI/Panels/ClassDes_Options.cs
	premake4.lin