push
Merge branch 'Atlas_3' into Master_2

Conflicts:
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
d