3D2D
Merge branch 'master' of https://github.com/fhacktory/StochasticMind

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	ProjectSettings/EditorBuildSettings.asset