Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/NetworkManager.cs
	Cigam-csharp.sln
	Cigam.sln
	Cigam.userprefs