commit
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	Assets/Scenes/loginScene.unity
	ProjectSettings/EditorBuildSettings.asset