Merge remote-tracking branch 'Github/SergioYMaria'

Conflicts:
	Assets/Scenes/TesteScene.unity
	SlotTyper-csharp.sln
	SlotTyper.sln