fixed issues with merge
 new menu
Removed bloat - Luke
Merge branch 'master' of https://github.com/tashage/sonshine

Blame Luke

Conflicts:
	SonshineTheActualThing/Assembly-CSharp-Editor-vs.csproj
	SonshineTheActualThing/Assembly-CSharp-Editor.csproj
	SonshineTheActualThing/Assembly-CSharp-firstpass-vs.csproj
	SonshineTheActualThing/Assembly-CSharp-firstpass.csproj
	SonshineTheActualThing/Assembly-CSharp-vs.csproj
	SonshineTheActualThing/Assembly-CSharp.csproj
	SonshineTheActualThing/Assembly-UnityScript-Editor-vs.unityproj
	SonshineTheActualThing/Assembly-UnityScript-Editor.unityproj
	SonshineTheActualThing/Assembly-UnityScript-firstpass-vs.unityproj
	SonshineTheActualThing/Assembly-UnityScript-firstpass.unityproj
	SonshineTheActualThing/SonshineTheActualThing-csharp.sln
	SonshineTheActualThing/SonshineTheActualThing.sln
	SonshineTheActualThing/UnityVS.SonshineTheActualThing.CSharp.Editor.csproj
	SonshineTheActualThing/UnityVS.SonshineTheActualThing.CSharp.Plugins.csproj
	SonshineTheActualThing/UnityVS.SonshineTheActualThing.CSharp.csproj
	SonshineTheActualThing/UnityVS.SonshineTheActualThing.sln
	SonshineTheActualThing/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Removed OBJ folder
Blame Luke
Merge branch 'master' into anton