animationcontroller WIP
Merge remote-tracking branch 'upstream/master' into eli-master

Conflicts:
	Assets/Scripts/PlayerAnimationController.cs
	Assets/Scripts/PlayerAnimationController.cs.meta
	Assets/Scripts/PlayerController.cs