pruebas iTween
Merge remote-tracking branch 'origin/rama-Daniel' into rama-Alejo

Conflicts:
	Assets/Code/Scripts/DesplazamientoObjetosGUI.cs
	Assets/Scene/Play.unity
	Assets/TouchScript/Devices/Display/TVs/FullHD TV 42.asset
	Assets/TouchScript/Devices/Display/TVs/FullHD TV 50.asset
	Assets/TouchScript/Devices/Display/TVs/FullHD TV 55.asset
commit bobo
temo

temp
Mejora

Mejora de animación
merge commit

Merge remote-tracking branch 'origin/rama-Daniel' into rama-Alejo

Conflicts:
	Assets/Code/Scripts/DesplazamientoObjetosGUI.cs
	Assets/NGUI.meta
	Assets/Scene/Play.unity
	Assets/TouchScript/Devices/Display/TVs/FullHD TV 42.asset
	Assets/TouchScript/Devices/Display/TVs/FullHD TV 50.asset
	Assets/TouchScript/Devices/Display/TVs/FullHD TV 55.asset
Mejoramiento estado cupón

Parte funcional estado cupón, activación de botones.
Cronometro mejorado

Cronometro mejorado
Bugs cupones

Correcciones de algunos bugs con la funcionalidad de los cupones
Merge remote-tracking branch 'origin/rama-Alejo' into rama-Daniel

Conflicts:
	Assets/Code/Scripts/ControlPadre.cs
	Assets/Code/Scripts/DataPlayState.cs
	Assets/Prefabs/GameManager.prefab
	Assets/Prefabs/Inicio/NGUI Zona Home.prefab
	Assets/Scene/Hist.unity
	Assets/Scene/Home.unity
	Assets/Scene/Play.unity
	ProjectSettings/TagManager.asset