Animations
Merge remote-tracking branch 'upstream/master' into feature/addAndPlaySoundEffects

Conflicts:
	Assets/Scripts/PlayerController.cs