endingApproach
Merge branch 'Atlas_4' into Master_2

Conflicts:
	Gemini/Assets/Script/Test/TestManager.cs
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/EditorUserBuildSettings.asset
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
	Gemini/Library/metadata/54/543ae8364546043b5a5d3f2f8961d43a