Merge branch 'NewAnimations_BH'

Conflicts:
	Assets/scenes/Levels/LevelsTesting/New2DCharacter.unity
Merge remote-tracking branch 'origin/master' into NewAnimations

Conflicts:
	Assets/scenes/Levels/LevelsTesting/New2DCharacter.unity