- fix animations + behaviour
- merged
- only the tag assest conflict
Merge branch 'master' of https://github.com/orukinawa/Project-Zombot

Conflicts:
	ProjectSettings/TagManager.asset