water and some other details
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3