Merge branch 'vistas' into controllers
Cambio de password
Completa validacion de formulario
Merge branch 'controllers' into vistas

Conflicts:
	application/public/js/client.js
Agrega modificacion de asignaturas