Merge branch 'master' into A-C
Level Designed
Merge branch 'A-C'

Conflicts:
	Gemini/Library/assetDatabase3