Added more for testing battle scenes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ArchonClone/ProjectSettings/TagManager.asset