Merge branch 'master' into Sinhue
Merge branch 'master' into Sinhue
codekit
Merge branch 'Yoshua'

Conflicts:
	config.codekit
Merge branch 'master' into Sinhue
Añadido action a formulario de Login.
Merge pull request #1 from yoshuadiaz/Sinhue

Integrado Login de forma fea.
Merge branch 'master' into Yoshua

Conflicts:
	config.codekit