Merge branch 'Master_2' into Atlas_4
ahaha
Merge branch 'Atlas_4' into Master_2

Conflicts:
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/assetDatabase3