ok?
Merge branch 'master' of https://github.com/applinet/ar.com.speedway.propuestas

Conflicts:
	AppProperties/xspdesign.properties
	Code/Agents/(Obtener Correlativo).lsa
	Code/Java/ar/com/hdi/autos/propuestas/OrderValidators.java
	Code/Java/ar/com/hdi/autos/propuestas/OrderValidators.java.metadata
	Code/Java/ar/com/hdi/autos/utilidades/DocLock.java.metadata
	Code/Java/ar/com/hdi/autos/utilidades/JSFUtil.java.metadata
	Code/Java/ar/com/hdi/autos/vehiculos/NuevaAS.java.metadata
	Code/Java/ar/com/hdi/autos/vehiculos/NuevaOperacion.java.metadata
	Code/Java/ar/com/hdi/autos/vehiculos/NuevoComponente.java.metadata
	Code/Java/ar/com/hdi/autos/vehiculos/Propuestas.java.metadata
	Code/ScriptLibraries/CustomControlLib.js.metadata
	Code/ScriptLibraries/Funciones Generales.lss.metadata
	Code/ScriptLibraries/GeneralFunctions.jss.metadata
	Code/ScriptLibraries/IncludeLSConst.lss.metadata
	Code/ScriptLibraries/IsGroupMember.jss.metadata
	Code/ScriptLibraries/JS.control.FE.v01.js.metadata
	Code/ScriptLibraries/JSS.Estados.jss.metadata
	Code/ScriptLibraries/JSS.InsFacturacion.jss.metadata
	Code/ScriptLibraries/JSS.InsValidation.jss.metadata
	Code/ScriptLibraries/JSS.Inspeccion.jss.metadata
	Code/ScriptLibraries/JSS.MailingFunctions.jss.metadata
	Code/ScriptLibraries/JSS.Validation.jss.metadata
	Code/ScriptLibraries/JSS.veh.general.jss.metadata
	Code/ScriptLibraries/LS.Estados.lss.metadata
	Code/ScriptLibraries/LS.Inspecciones.lss.metadata
	Code/ScriptLibraries/LS.Mailing.lss.metadata
	Code/ScriptLibraries/LS.general.BE.v01.lss.metadata
	Code/ScriptLibraries/RESTObjectFunctions.jss.metadata
	Code/ScriptLibraries/SJS.log.BE.v01.jss.metadata
	Code/ScriptLibraries/layoutDividirPantalla.js.metadata
	Code/ScriptLibraries/seqNum.jss.metadata
	Code/dbscript.lsdb
	CustomControls/CCAB_FrmPropuestas.xsp-config
	CustomControls/MultiValueDeselectBox.xsp.metadata
	CustomControls/NavigatorWellcome.xsp.metadata
	CustomControls/TestJuanccFrm_Componente.xsp-config
	CustomControls/ccAB_FrmMostrador.xsp.metadata
	CustomControls/ccAB_FrmVehiculos.xsp.metadata
	CustomControls/ccAB_viewPropuestasEnProceso.xsp.metadata
	CustomControls/ccAS400.xsp.metadata
	CustomControls/ccDialogNuevaOperacion.xsp.metadata
	CustomControls/ccDialogNuevoComponente.xsp.metadata
	CustomControls/ccFrm_Componente.xsp.metadata
	CustomControls/ccFrm_ComponenteGrilla_1.xsp
	CustomControls/ccFrm_ComponenteGrilla_1.xsp-config
	CustomControls/ccFrm_ComponenteManaged.xsp-config
	CustomControls/ccFrm_Componente_1.xsp-config
	CustomControls/ccFrm_InsFacturacion.xsp.metadata
	CustomControls/ccFrm_Inspeccion.xsp.metadata
	CustomControls/ccFrm_Mail.xsp.metadata
	CustomControls/ccFx_MascarasJQuery.xsp.metadata
	CustomControls/ccGrilla_Bonificaciones.xsp-config
	CustomControls/ccGrilla_Componente.xsp
	CustomControls/ccLayoutDividirPantalla.xsp.metadata
	CustomControls/ccLayoutDividirPantalla_old.xsp.metadata
	CustomControls/ccListadoMails.xsp.metadata
	CustomControls/ccListadomailsForm.xsp.metadata
	CustomControls/ccLoginDialog.xsp.metadata
	CustomControls/ccNavAutomoviles.xsp
	CustomControls/ccNavAutomoviles.xsp.metadata
	CustomControls/ccNavIns.xsp.metadata
	CustomControls/ccView_Ins_ConFactura.xsp.metadata
	CustomControls/ccView_Ins_Estado.xsp.metadata
	CustomControls/ccView_Ins_Facturas.xsp.metadata
	CustomControls/ccView_Ins_SinFactura.xsp.metadata
	CustomControls/ccView_Ins_SinPropuesta.xsp.metadata
	CustomControls/ccView_Ins_Todas.xsp.metadata
	CustomControls/ccView_Ins_Veh.xsp.metadata
	CustomControls/ccView_Ins_Veh_Grilla.xsp.metadata
	CustomControls/ccView_idPadreBackup.xsp.metadata
	CustomControls/loadingMasks.xsp.metadata
	CustomControls/oneuiLayout.xsp.metadata
	CustomControls/picklist.xsp.metadata
	CustomControls/viewpicklist.xsp.metadata
	Resources/Files/ListVeh.xml.metadata
	Resources/Files/add.png.metadata
	Resources/Files/cross.png.metadata
	Resources/Files/delete.png.metadata
	Resources/StyleSheets/MVDBCC.css.metadata
	Resources/StyleSheets/Propuestas.css.metadata
	Resources/StyleSheets/forms.css.metadata
	Resources/StyleSheets/hdi_buttons.css.metadata
	Resources/StyleSheets/hdi_gerling.css.metadata
	Resources/StyleSheets/htmltable.css.metadata
	Resources/StyleSheets/layoutPropuesta.css.metadata
	Resources/StyleSheets/viewIns.css.metadata
	Resources/StyleSheets/viewpicklistCC.css.metadata
	Resources/StyleSheets/views.css.metadata
	Views/Propuestas Emitidas.view
	Views/Propuestas en Proceso.view
	Views/Sys_5cProcesos_5cvPR_5fMailPorProcesar.view
	Views/Sys_5cPropuestas_5cvLK_5fPropuestas en Proceso.view
	Views/UI_5cAsociadas_5cvPR_5fidPadre.view
	Views/UI_5cPropuestas_5cEmitidas.view
	Views/UI_5cPropuestas_5cvUI_5fPropuestasEnProceso.view
	Views/UI_5cPropuestas_5cvUI_5fPropuestasEnTecnica.view
	Views/vLK_Propuestas en Proceso.view
	Views/vPR_MailPorProcesar.view
	Views/vPR_idPadre.view
	Views/vUI_PropuestasEnTecnica.view
	WebContent/WEB-INF/faces-config.xml
	WebContent/WEB-INF/xsp.properties
	XPages/Bienvenido.xsp
	XPages/Bienvenido.xsp.metadata
	XPages/Bienvenido_2.xsp.metadata
	XPages/RestFullXpage.xsp.metadata
	XPages/ViewMostrador.xsp.metadata
	XPages/ViewPropuestasEnProceso.xsp.metadata
	XPages/XPageReadXML.xsp.metadata
	XPages/_TestComponente.xsp
	XPages/viewInsVeh.xsp.metadata
	XPages/viewIns_Aprobadas.xsp.metadata
	XPages/viewIns_Borrador.xsp.metadata
	XPages/viewIns_ConFactura.xsp.metadata
	XPages/viewIns_EnComercial.xsp.metadata
	XPages/viewIns_Enviadas.xsp.metadata
	XPages/viewIns_Facturas.xsp.metadata
	XPages/viewIns_Inspeccionadas.xsp.metadata
	XPages/viewIns_NoFacturables.xsp.metadata
	XPages/viewIns_NoRealizadas.xsp.metadata
	XPages/viewIns_Rechazadas.xsp.metadata
	XPages/viewIns_SinFactura.xsp.metadata
	XPages/viewIns_SinPropuesta.xsp.metadata
	XPages/viewIns_Todas.xsp.metadata
	XPages/xfDocComponente.xsp.metadata
	XPages/xfDocInsFactura.xsp.metadata
	XPages/xfDocInspeccion.xsp.metadata
	XPages/xfdocMail.xsp.metadata
	XPages/xfdocPropuesta.xsp
	XPages/xfdocPropuesta.xsp.metadata
	XPages/xvLK_PropuestasEnProceso.xsp.metadata
	XPages/xvUI_Mostrador.xsp.metadata
	XPages/xvUI_Por_Estado.xsp.metadata
	XPages/zTestComponente.xsp
	spwAU_D_ODP/.project
	spwAU_D_ODP/.settings/org.eclipse.core.resources.prefs
	spwAU_D_ODP/AppProperties/$DBIcon
	spwAU_D_ODP/AppProperties/database.properties
	spwAU_D_ODP/Code/Agents/(Inspeccion Enviar).lsa
	spwAU_D_ODP/Code/Agents/(Inspeccion Query Open).lsa
	spwAU_D_ODP/Code/Agents/(Obtener Correlativo Externo).ja
	spwAU_D_ODP/Code/Agents/(ValidatorAgent).lsa
	spwAU_D_ODP/Code/Agents/(agDocContext).lsa
	spwAU_D_ODP/Code/Agents/LS.ADMIN.ModFields.CambiarFechaEnvio.v001.lsa
	spwAU_D_ODP/Code/Agents/LS.DailyAgents.BE.ProcesoArriboMail.lsa
	spwAU_D_ODP/Code/Agents/Obtener Correlativo sin Save.lsa
	spwAU_D_ODP/Code/Agents/Probar Correlativo.lsa
	spwAU_D_ODP/Code/Agents/Simular Rta a Inspección.lsa
	spwAU_D_ODP/Code/Java/ar/com/hdi/autos/utilidades/DocLock.java
	spwAU_D_ODP/Code/Java/ar/com/hdi/autos/utilidades/JSFUtil.java
	spwAU_D_ODP/Code/Java/eu/linqed/debugtoolbar/DebugToolbar.java
	spwAU_D_ODP/Code/Java/eu/linqed/debugtoolbar/Message.java
	spwAU_D_ODP/Code/ScriptLibraries/GeneralFunctions.jss
	spwAU_D_ODP/Code/ScriptLibraries/JSS.Estados.jss
	spwAU_D_ODP/Code/ScriptLibraries/JSS.Inspeccion.jss
	spwAU_D_ODP/Code/ScriptLibraries/JSS.veh.general.jss
	spwAU_D_ODP/Code/ScriptLibraries/xpDebugToolbar.jss
	spwAU_D_ODP/Code/actions/Shared Actions
	spwAU_D_ODP/CustomControls/ccAB_FrmMostrador.xsp
	spwAU_D_ODP/CustomControls/ccAS400.xsp
	spwAU_D_ODP/CustomControls/ccDebugToolbar.xsp
	spwAU_D_ODP/CustomControls/ccDebugToolbar.xsp-config
	spwAU_D_ODP/CustomControls/ccDialogNuevaOperacion.xsp
	spwAU_D_ODP/CustomControls/ccDialogNuevoComponente_BU20141001.xsp
	spwAU_D_ODP/CustomControls/ccFrm_Componente.xsp
	spwAU_D_ODP/CustomControls/ccFrm_ComponenteGrilla_1.xsp
	spwAU_D_ODP/CustomControls/ccFrm_ComponenteGrilla_1.xsp-config
	spwAU_D_ODP/CustomControls/ccFrm_ComponenteManaged.xsp
	spwAU_D_ODP/CustomControls/ccFrm_ComponenteManaged.xsp-config
	spwAU_D_ODP/CustomControls/ccFrm_Componente_1.xsp
	spwAU_D_ODP/CustomControls/ccFrm_Componente_1.xsp-config
	spwAU_D_ODP/CustomControls/ccFrm_Inspeccion.xsp
	spwAU_D_ODP/CustomControls/ccGeneralMail.xsp.metadata
	spwAU_D_ODP/CustomControls/ccView_Ins_Veh_Grilla.xsp
	spwAU_D_ODP/CustomControls/oneuiLayout_BU20131108.xsp
	spwAU_D_ODP/CustomControls/viewpicklist.xsp
	spwAU_D_ODP/Forms/ConfiguracionAU.form
	spwAU_D_ODP/Forms/Copy Of Componente.form
	spwAU_D_ODP/Forms/Facturación Inspecciones.form
	spwAU_D_ODP/Forms/Inspeccion.form
	spwAU_D_ODP/Forms/Mail.form
	spwAU_D_ODP/Forms/Memo Linked.form
	spwAU_D_ODP/Forms/Notes_5cMemo.form
	spwAU_D_ODP/Forms/Propuesta.form
	spwAU_D_ODP/Forms/cPanel.form
	spwAU_D_ODP/Forms/fStates.form
	spwAU_D_ODP/Forms/fUserName.form
	spwAU_D_ODP/Forms/frmContact.form
	spwAU_D_ODP/Resources/AboutDocument
	spwAU_D_ODP/Resources/Files/Ret.xml.metadata
	spwAU_D_ODP/Resources/Files/names.xsl.metadata
	spwAU_D_ODP/Resources/IconNote
	spwAU_D_ODP/Resources/Images/AG_add_button24x24.png.metadata
	spwAU_D_ODP/Resources/Images/AG_delete_button24x24.png.metadata
	spwAU_D_ODP/Resources/Images/AG_save-check24x24.png.metadata
	spwAU_D_ODP/Resources/Images/AG_save_as24x24.png.metadata
	spwAU_D_ODP/Resources/Images/Check-icon.png.metadata
	spwAU_D_ODP/Resources/Images/HDI_39x35.gif.metadata
	spwAU_D_ODP/Resources/Images/HeaderWebHDI.jpg.metadata
	spwAU_D_ODP/Resources/Images/exclamation.png.metadata
	spwAU_D_ODP/Resources/Images/hdi_gerling_logo.gif.metadata
	spwAU_D_ODP/Resources/Images/iconValuePicker.png.metadata
	spwAU_D_ODP/Resources/Images/loaderimg.gif.metadata
	spwAU_D_ODP/Resources/Images/loaderimg2.gif.metadata
	spwAU_D_ODP/Resources/Images/old_2ffavicon_5fhdi.gif.metadata
	spwAU_D_ODP/Resources/Images/oneUI_LogoAplicacion.gif.metadata
	spwAU_D_ODP/Resources/Images/oneUI_LogoFooter.gif.metadata
	spwAU_D_ODP/Resources/Images/sol_add24x24.png.metadata
	spwAU_D_ODP/Resources/Images/sprites_sol.gif.metadata
	spwAU_D_ODP/Resources/Images/sprites_veh.gif.metadata
	spwAU_D_ODP/Resources/Images/user_group_new.png.metadata
	spwAU_D_ODP/Resources/Images/user_group_new_CP.png.metadata
	spwAU_D_ODP/Resources/StyleSheets/hdi_buttons.css
	spwAU_D_ODP/Resources/StyleSheets/layoutDividirPantalla.css.metadata
	spwAU_D_ODP/SharedElements/Columns/(Copy Of Sys_5cPropuestas_5cpor Código).column
	spwAU_D_ODP/SharedElements/Columns/(Sys_5cPropuestas_5cpor Código).column
	spwAU_D_ODP/SharedElements/Columns/All.column
	spwAU_D_ODP/SharedElements/Columns/ArticuloCodigo.column
	spwAU_D_ODP/SharedElements/Columns/ArticuloDescripcion.column
	spwAU_D_ODP/SharedElements/Columns/Configuracion.column
	spwAU_D_ODP/SharedElements/Columns/Copy Of All.column
	spwAU_D_ODP/SharedElements/Columns/Copy Of Configuracion.column
	spwAU_D_ODP/SharedElements/Columns/DetailedRecord.column
	spwAU_D_ODP/SharedElements/Columns/EstadoCodigo.column
	spwAU_D_ODP/SharedElements/Columns/EstadoDescripcion.column
	spwAU_D_ODP/SharedElements/Columns/FechaEnvioAnioCategorized.column
	spwAU_D_ODP/SharedElements/Columns/FechaEnvioDiaCategorized.column
	spwAU_D_ODP/SharedElements/Columns/FechaEnvioMesCategorized.column
	spwAU_D_ODP/SharedElements/Columns/Notes_5cPropuestas en Mostrador(5)_5cConfiguracion.column
	spwAU_D_ODP/SharedElements/Columns/NroPoliza.column
	spwAU_D_ODP/SharedElements/Columns/NroSolicitud.column
	spwAU_D_ODP/SharedElements/Columns/PruebasDiego.column
	spwAU_D_ODP/SharedElements/Columns/RamaCodigo.column
	spwAU_D_ODP/SharedElements/Columns/RamaDescripcion.column
	spwAU_D_ODP/SharedElements/Columns/redsdf.column
	spwAU_D_ODP/SharedElements/Columns/vPR_MailPorProcesar.column
	spwAU_D_ODP/SharedElements/Subforms/Acciones por Defecto en Formularios Notes.subform
	spwAU_D_ODP/SharedElements/Subforms/FechaEnvio.subform
	spwAU_D_ODP/SharedElements/Subforms/NumeroCorrelativo.subform
	spwAU_D_ODP/Views/Configuracion.view
	spwAU_D_ODP/Views/Notes_5cConf_5ctodos por form.view
	spwAU_D_ODP/Views/Notes_5cInbox.view
	spwAU_D_ODP/Views/Notes_5cPropuestas en Mostrador(5).view
	spwAU_D_ODP/Views/Notes_5cPropuestas en Stock(98).view
	spwAU_D_ODP/Views/Notes_5cPropuestas en Suspendida Especial(85).view
	spwAU_D_ODP/Views/Notes_5cPropuestas en Suspendida(87).view
	spwAU_D_ODP/Views/Notes_5cPropuestas en Tecnica(15).view
	spwAU_D_ODP/Views/Sys_5cAll.view
	spwAU_D_ODP/Views/Sys_5cInspecciones_5cpor Consecutivo.view
	spwAU_D_ODP/Views/Sys_5cInspecciones_5cpor Veh.view
	spwAU_D_ODP/Views/Sys_5cMails Linked.view
	spwAU_D_ODP/Views/Sys_5cMails Not Linked.view
	spwAU_D_ODP/Views/Sys_5cPapelera.view
	spwAU_D_ODP/Views/Sys_5cProcesos_5cvPR_5fMailPorProcesar.view
	spwAU_D_ODP/Views/Sys_5cPropuestas_5cpor Código.view
	spwAU_D_ODP/Views/Sys_5cPropuestas_5cvLK_5fPropuestas en Proceso.view
	spwAU_D_ODP/Views/Sys_5cTodos.view
	spwAU_D_ODP/Views/Sys_5cVehiculos.view
	spwAU_D_ODP/Views/UI_5cAsociadas_5cvPR_5fidPadre.view
	spwAU_D_ODP/Views/UI_5cFacturas de Inspecciones.view
	spwAU_D_ODP/Views/UI_5cInspecciones_5cCon Factura.view
	spwAU_D_ODP/Views/UI_5cInspecciones_5cSin Factura.view
	spwAU_D_ODP/Views/UI_5cInspecciones_5cSin Propuesta.view
	spwAU_D_ODP/Views/UI_5cInspecciones_5cpor Estado.view
	spwAU_D_ODP/Views/UI_5cInspecciones_5cpor Vehiculo.view
	spwAU_D_ODP/Views/UI_5cInspecciones_5ctodas.view
	spwAU_D_ODP/Views/UI_5cPropuestas_5cEmitidas.view
	spwAU_D_ODP/Views/UI_5cPropuestas_5cvUI_5fPropuestasEnProceso.view
	spwAU_D_ODP/Views/UI_5cPropuestas_5cvUI_5fPropuestasEnTecnica.view
	spwAU_D_ODP/XPages/ViewMostrador.xsp
	spwAU_D_ODP/XPages/borrar_lockeo.xsp
	spwAU_D_ODP/XPages/borrar_lockeo_1.xsp
	spwAU_D_ODP/XPages/borrar_xvUI_Por_Estado_Cat.xsp
	spwAU_D_ODP/XPages/debugToolbarConsole.xsp
	spwAU_D_ODP/XPages/debugToolbarErrorPage.xsp
	spwAU_D_ODP/XPages/xfdocMail.xsp
	spwAU_D_ODP/XPages/zTestComponente.xsp
	spwAU_D_ODP/plugin.xml