Ending Compose
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Gemini.userprefs