Merge branch 'master' into Atlas_2
Falling star + level Gating
Level_test complete
small changes
Merge branch 'Atlas_2'

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