added
Merge branch 'master' of github.com:ennuma/GameApp

Conflicts:
	Assets/Script/EventType/Battle/BattleTurnEndEvent.cs.meta