c2
Merge branch 'master' into Escena1-Plug

Conflicts:
	Assets/Scenes/Stage1.unity