Some things I left out
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceRace/Assembly-CSharp-vs.csproj
	SpaceRace/Assembly-UnityScript-vs.unityproj
	SpaceRace/Library/CurrentLayout.dwlt
	SpaceRace/Library/assetDatabase3
	SpaceRace/Library/expandedItems
	SpaceRace/Library/guidmapper
	SpaceRace/SpaceRace-csharp.sln
	SpaceRace/SpaceRace.sln