For Jenova
Merge branch 'Atlas_3'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_ForJenova.unity
	Gemini/Assets/Material/Archetecture/StairLight.mat
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper