cambio en properties, seceURL
Merge branch 'master' of https://github.com/mamgjigsaw/sece

Conflicts:
	build/web/WEB-INF/classes/dao/SMTPAuthentication.class
	build/web/WEB-INF/classes/dao/dao.class
	build/web/WEB-INF/classes/dao/daoAcceso.class
	build/web/WEB-INF/classes/dao/daoAsignacionCapaContra.class
	build/web/WEB-INF/classes/dao/daoAsignacionSugItem.class
	build/web/WEB-INF/classes/dao/daoAvance.class
	build/web/WEB-INF/classes/dao/daoBitacora.class
	build/web/WEB-INF/classes/dao/daoContrato.class
	build/web/WEB-INF/classes/dao/daoDelegacionIndiUsu.class
	build/web/WEB-INF/classes/dao/daoEmailSent.class
	build/web/WEB-INF/classes/dao/daoEmpresa.class
	build/web/WEB-INF/classes/dao/daoEmpresasContratos.class
	build/web/WEB-INF/classes/dao/daoEscala.class
	build/web/WEB-INF/classes/dao/daoHistorialResultado.class
	build/web/WEB-INF/classes/dao/daoIndicador.class
	build/web/WEB-INF/classes/dao/daoItem.class
	build/web/WEB-INF/classes/dao/daoNoticias.class
	build/web/WEB-INF/classes/dao/daoOperacion.class
	build/web/WEB-INF/classes/dao/daoRespItem.class
	build/web/WEB-INF/classes/dao/daoSugerencia.class
	build/web/WEB-INF/classes/dao/daoUsuario.class
	build/web/WEB-INF/classes/dao/daoVariable.class
	build/web/WEB-INF/classes/dao/daoZone.class
	build/web/WEB-INF/classes/daoImpl/AccesoDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/AsignacionCapaContraDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/AsignacionSugItemDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/AvanceDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/BitacoraDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/ContratoDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/DelegacionIndiUsuDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/EmailSentDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/EmpresaDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/EscalaDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/HistorialResultadoDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/IndicadorDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/ItemDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/NoticiasDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/OperacionDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/PaisDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/RespItemDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/SugerenciaDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/UsuarioDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/VariableDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/ZoneDaoImpl.class
	build/web/WEB-INF/classes/daoImpl/daoEmpresasContratosImpl.class
	build/web/WEB-INF/classes/hibernate.cfg.xml
	build/web/WEB-INF/classes/micelanea.properties
	build/web/WEB-INF/classes/servlet/BusquedaItems.class
	build/web/WEB-INF/classes/servlet/BusquedaVariables.class
	build/web/WEB-INF/classes/servlet/GraficoHistorial.class
	build/web/WEB-INF/classes/servlet/GraficoResultado.class
	build/web/WEB-INF/classes/servlet/InformeFinal.class
	build/web/WEB-INF/classes/servlet/aprobarEmpresa.class
	build/web/WEB-INF/classes/servlet/bitacoraReporte.class
	build/web/WEB-INF/classes/servlet/empresaNoAsignada.class
	build/web/WEB-INF/classes/servlet/entrar.class
	build/web/WEB-INF/classes/servlet/generadorReport.class
	build/web/WEB-INF/classes/servlet/instrumento.class
	build/web/WEB-INF/classes/servlet/listaCap.class
	build/web/WEB-INF/classes/servlet/modifUser.class
	build/web/WEB-INF/classes/servlet/reportUsers.class
	build/web/WEB-INF/classes/servlet/salir.class
	build/web/WEB-INF/classes/servlet/saveAcceso.class
	build/web/WEB-INF/classes/servlet/saveIndicador.class
	build/web/WEB-INF/classes/servlet/saveItem.class
	build/web/WEB-INF/classes/servlet/saveRespItem.class
	build/web/WEB-INF/classes/servlet/saveUsuario.class
	build/web/WEB-INF/classes/servlet/saveVariable.class
	build/web/WEB-INF/classes/servlet/sendMail.class
	build/web/WEB-INF/classes/servlet/settingGraficoHistorial.class
	build/web/WEB-INF/classes/servlet/updateIndicdor.class
	build/web/WEB-INF/classes/servlet/updateItem.class
	build/web/WEB-INF/classes/servlet/updateVariable.class
	build/web/WEB-INF/classes/servlet/verFormatoInstrumento.class
	build/web/register.jsp
	dist/sece.war
	nbproject/private/private.properties
	nbproject/private/private.xml
last miguel