Merge branch 'Emanuel' into Jay - Oremos

Conflicts:
Assets/Scenes/GameScene.unity
Assets/Scripts/HeroManager.cs
ProjectSettings/TagManager.asset