Merge branch 'master' into Atlas_2
kk
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper