Leve modificaciones para arreglar merge
Merge remote-tracking branch 'origin/rama-Jhon' into rama-Jhon

Conflicts:
	New Unity Project/Assets/Prefabs/Botones/BotonCupones.prefab
	New Unity Project/Assets/Prefabs/Inicio/Prefab_Botones_V_Inicio.prefab
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	New Unity Project/Library/metadata/9d/9db4bfc85c1d2dd4dbc40130479335f1
	New Unity Project/Library/metadata/a3/a3014fe32325e9b4aa4023a2a0d1a766
	New Unity Project/Library/metadata/fa/fae8a045ad7b3ff418824c9904e3c1d0