build
Merge remote-tracking branch 'origin/master'

Conflicts:
	PSMG_Team_EasyNote/ProjectSettings/EditorBuildSettings.asset