Agrega validaciones
Merge branch 'controllers' into vistas

Conflicts:
	application/public/js/client.js
Agrega modificacion de asignaturas
Merge branch 'vistas' into controllers
Actualizacion de asignaturas