Revert "Merge branch 'Atlas_3'"

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/assetDatabase3