Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assembly-CSharp-Editor-vs.csproj
	RobotSpaceMiner/Assembly-CSharp-Editor.csproj
	RobotSpaceMiner/Assembly-CSharp-firstpass-vs.csproj
	RobotSpaceMiner/Assembly-CSharp-firstpass.csproj
	RobotSpaceMiner/Assembly-CSharp-vs.csproj
	RobotSpaceMiner/Assembly-CSharp.csproj
	RobotSpaceMiner/Assembly-UnityScript-firstpass-vs.unityproj
	RobotSpaceMiner/Assembly-UnityScript-firstpass.unityproj
	RobotSpaceMiner/RobotSpaceMiner-csharp.sln
	RobotSpaceMiner/RobotSpaceMiner.sln
Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assembly-CSharp-Editor-vs.csproj
	RobotSpaceMiner/Assembly-CSharp-Editor.csproj
	RobotSpaceMiner/Assembly-CSharp-firstpass-vs.csproj
	RobotSpaceMiner/Assembly-CSharp-firstpass.csproj
	RobotSpaceMiner/Assembly-CSharp-vs.csproj
	RobotSpaceMiner/Assembly-CSharp.csproj
	RobotSpaceMiner/Assembly-UnityScript-firstpass-vs.unityproj
	RobotSpaceMiner/Assembly-UnityScript-firstpass.unityproj
forced commit