Final Ending
Merge branch 'A-C'

Conflicts:
	Gemini/Library/guidmapper