stuff
Merge branch 'Pims'

Conflicts:
	Assets/_Scripts/AnimationMan.cs
	Assets/_Scripts/animcontroller.controller
	ProjectSettings/TagManager.asset