Main Menu Scene Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assembly-CSharp-Editor-vs.csproj
	RobotSpaceMiner/Assembly-CSharp-Editor.csproj
	RobotSpaceMiner/Assets/Standard Assets/Scripts/MainMenuManager.cs
	RobotSpaceMiner/Assets/Standard Assets/Scripts/SettingsMenu.cs
	RobotSpaceMiner/RobotSpaceMiner-csharp.sln
	RobotSpaceMiner/RobotSpaceMiner.sln
	RobotSpaceMiner/Settings.xml
Forced Commit