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

Conflicts:
	Gemini/Library/assetDatabase3
12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/EditorUserBuildSettings.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
	Gemini/ProjectSettings/EditorBuildSettings.asset
421
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
213124
asas
Merge branch 'Atlas_2'

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