Merge branch 'master' into Yoshua
Animacion
Merge branch 'Yoshua'
App and Team
Merge branch 'Yoshua'
Merge branch 'master' into Yoshua
pulsera pagina
codekit
Merge branch 'Yoshua'

Conflicts:
	config.codekit
Merge branch 'master' into Sinhue
Añadido action a formulario de Login.