Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Main.unity
	Assets/Scripts/Managers/PlayerManager.cs

!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Main.unity
	Assets/Scripts/Managers/PlayerManager.cs