actualizacion por primera entrega
Merge https://github.com/cfdevalle/ISFTwebapp
Merge branch 'master' of https://github.com/cfdevalle/ISFTwebapp

Conflicts:
	src/org/isft/domain/DataBase.java
	war/WEB-INF/jsp/sif/display/consultar_inscripcion.jsp
	war/WEB-INF/jsp/sif/display/cronograma_fechas.jsp
	war/WEB-INF/jsp/sif/display/pantalla_bienvenida.jsp
	war/WEB-INF/jsp/sif/display/realizar_inscripcion.jsp
	war/WEB-INF/jsp/sif/includes/sif_menu.jsp
actualizacion
actualizacion sif
Merge https://github.com/cfdevalle/ISFTwebapp
	new file:   src/org/isft/web/tags/TagGrillaFinalesAInscribir.java
	modified:   war/WEB-INF/jsp/sif/display/realizar_inscripcion2.jsp
	new file:   war/WEB-INF/jsp/sif/display/tagGrillaFinalesAInscribir.jsp
	modified:   war/WEB-INF/tld/taglib.tld
Merge branch 'master' of https://github.com/cfdevalle/ISFTwebapp