Merge branch 'master' of https://github.com/nkornek/Spaceship

Conflicts:
	SpaceShip/Assembly-CSharp-Editor-vs.csproj
	SpaceShip/Assembly-CSharp-Editor.csproj
	SpaceShip/Assembly-CSharp-vs.csproj
	SpaceShip/Assembly-CSharp.csproj
	SpaceShip/ProjectSettings/TagManager.asset
	SpaceShip/SpaceShip-csharp.sln
	SpaceShip/SpaceShip.sln