sed
Merge branch 'master' of https://github.com/leofaster/sistemadecambiosdecarrera

Conflicts:
	build/web/WEB-INF/classes/actions/EstudianteAction.class
	build/web/WEB-INF/classes/actions/SolicitudAction.class
	dist/Sistema_de_Cambios_de_Carrera.war
	nbproject/private/private.properties
quasi sesiones