12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
12
123
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
ok
Merge branch 'master' into Atlas_2