12312
Merge branch 'A-C'
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
All constellation
gyjg
Merge branch 'A-C'
Tutorial, Credits and 2P mode
Merge branch 'A-C'
123
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/Script/CharMove.cs
	Gemini/Assets/Script/Global.cs
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
fix tutorial
Merge branch 'A-C'

Conflicts:
	Gemini/Library/assetDatabase3
fade effects
a
Merge branch 'master' into A-C