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

Conflicts:
	.gitignore
	dist/Sistema_de_Cambios_de_Carrera.war
	nbproject/private/private.properties
	src/java/actions/SolicitudAction.java