closer relationship
Merge branch 'master' into Atlas_2
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Merge branch 'master' into Atlas_2
ok
Up and down limited to 1f
merge
test
3D + Short Trail
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
123
Merge branch 'master' into Zc-Z
123
1231