Primer Commit; agregue la estructura de archivos
bajado y sincronizado version ftp
hola desde root vps
Merge branch 'master' of https://github.com/softdesignermonteria/prestamos

Conflicts:
	.gitignore
	Library/Kumbia/Db/Adapters/Native/Mysql.php
	Library/Kumbia/Tag/Tag.php
	apps/default/controllers/administrador_controller.php
	apps/default/controllers/application.php
	apps/default/controllers/bodegas_controller.php
	apps/default/controllers/centro_produccion_controller.php
	apps/default/controllers/clientes_controller.php
	apps/default/controllers/compras_controller.php
	apps/default/controllers/consecutivos_controller.php
	apps/default/controllers/creditos_controller.php
	apps/default/controllers/cxc_controller.php
	apps/default/controllers/departamentos_controller.php
	apps/default/controllers/empleados_controller.php
	apps/default/controllers/facturacion_controller.php
	apps/default/controllers/libros_controller.php
	apps/default/controllers/login_controller.php
	apps/default/controllers/municipios_controller.php
	apps/default/controllers/print_controller.php
	apps/default/controllers/proveedores_controller.php
	apps/default/controllers/tarifa_iva_controller.php
	apps/default/controllers/tipo_documento_controller.php
	apps/default/logs/auth_failed.txt
	apps/default/models/admin.php
	apps/default/models/clientes.php
	apps/default/models/departamentos.php
	apps/default/models/municipios.php
	apps/default/models/tipo_documento.php
	apps/default/views/administrador/agregar.phtml
	apps/default/views/administrador/buscar.phtml
	apps/default/views/administrador/index.phtml
	apps/default/views/administrador/modificar.phtml
	apps/default/views/administrador/show.phtml
	apps/default/views/centro_produccion/find_buscar.phtml
	apps/default/views/clientes/agregar.phtml
	apps/default/views/clientes/delete.phtml
	apps/default/views/clientes/modificar.phtml
	apps/default/views/creditos/agregar.phtml
	apps/default/views/creditos/buscar.phtml
	apps/default/views/creditos/index.phtml
	apps/default/views/creditos/modificar.phtml
	apps/default/views/creditos/show.phtml
	apps/default/views/departamentos/find_buscar.phtml
	apps/default/views/departamentos/index.phtml
	apps/default/views/empleados/agregar.phtml
	apps/default/views/empleados/find_buscar.phtml
	apps/default/views/empleados/find_detalle_buscar.phtml
	apps/default/views/empleados/show.phtml
	apps/default/views/imagenes/buscar_imagenes.phtml
	apps/default/views/layouts/adminiziolite.phtml
	apps/default/views/libros/detalle_facturas.phtml
	apps/default/views/libros/general_pdf.phtml
	apps/default/views/login/login.phtml
	apps/default/views/municipios/find_buscar.phtml
	apps/default/views/municipios/find_detalle_buscar.phtml
	apps/default/views/partials/_adminiziolite_menu.phtml
	apps/default/views/partials/_adminiziolite_menu_left.phtml
	apps/default/views/partials/_adminiziolite_pie.phtml
	apps/default/views/partials/_javascript.phtml
	apps/default/views/partials/_javascript2.phtml
	apps/default/views/print/facturacion.phtml
	apps/default/views/print/recibos_caja_html.phtml
	apps/default/views/proveedores/agregar.phtml
	apps/default/views/proveedores/buscar.phtml
	apps/default/views/proveedores/detalle_buscar.phtml
	apps/default/views/proveedores/find_buscar.phtml
	apps/default/views/proveedores/modificar.phtml
	public/files/huellas/Huellero.jar
	public/files/huellas/keystore
	public/files/huellas/lib/dpfpenrollment.jar
	public/files/huellas/lib/dpfpverification.jar
	public/files/huellas/lib/dpotapi.jar
	public/files/huellas/lib/dpotjni.jar
	public/javascript/core/framework/jquery/jquery.dropdown.js
	public/javascript/core/main.php
	public/javascript/core/sh/shBrushPhp.js
	public/javascript/core/sh/shCore.js
	public/javascript/core/validator.js
	public/javascript/core/window/PWC-OS/index.html
	public/javascript/core/window/PWC-OS/pwc-os.css
	public/javascript/core/window/documentation/PWC-OS/index.html
	public/javascript/core/window/documentation/PWC-OS/pwc-os.css
	public/javascript/core/window/documentation/debug.html
	public/javascript/core/window/documentation/documentation.html
	public/javascript/core/window/documentation/info_panel.html
	public/javascript/core/window/documentation/js/application.js
	public/javascript/core/window/documentation/samples.html
	public/javascript/core/window/documentation/themes.html
	public/javascript/core/window/documentation/themes/alert.css
	public/javascript/core/window/documentation/themes/alert_lite.css
	public/javascript/core/window/documentation/themes/alphacube.css
	public/javascript/core/window/documentation/themes/darkX.css
	public/javascript/core/window/documentation/themes/default.css
	public/javascript/core/window/documentation/themes/iefix/iepngfix.css
	public/javascript/core/window/documentation/themes/lighting.css
	public/javascript/core/window/documentation/themes/mac_os_x.css
	public/javascript/core/window/documentation/themes/mac_os_x_dialog.css
	public/javascript/core/window/documentation/themes/nuncio.css
	public/javascript/core/window/documentation/themes/spread.css
	public/javascript/core/window/documentation/themes/spread/.gif
	public/javascript/core/window/samples/constraint.html
	public/javascript/core/window/samples/dialog.html
	public/javascript/core/window/samples/inframe.html
	public/javascript/core/window/samples/multi_modal.html
	public/javascript/core/window/samples/oldFirstSampleCode.html
	public/javascript/core/window/samples/openInside.html
	public/javascript/core/window/samples/parent.html
	public/javascript/core/window/samples/popup_open.html
	public/javascript/core/window/samples/rico/index.html
	public/javascript/core/window/samples/rico/rico.css
	public/javascript/core/window/samples/rico/rico_change.js
	public/javascript/core/window/samples/tooltips/tooltip.html
	public/javascript/core/window/samples/window_key.html
	public/javascript/core/window/samples/window_key_url_content.html
	public/javascript/core/window/samples/window_store.html
	public/javascript/core/window/themes/alert.css
	public/javascript/core/window/themes/alert_lite.css
	public/javascript/core/window/themes/alphacube.css
	public/javascript/core/window/themes/darkX.css
	public/javascript/core/window/themes/default.css
	public/javascript/core/window/themes/iefix/iepngfix.css
	public/javascript/core/window/themes/lighting.css
	public/javascript/core/window/themes/mac_os_x.css
	public/javascript/core/window/themes/mac_os_x_dialog.css
	public/javascript/core/window/themes/nuncio.css
	public/javascript/core/window/themes/spread.css
	public/javascript/core/window/themes/spread/.gif
	public/javascript/index.html
	public/javascript/jqgrid/css/ellipsis-xbl.xml
	public/javascript/jqgrid/css/ui.jqgrid.css
	public/javascript/jqgrid/demo/36ajaxing.html
	public/javascript/jqgrid/demo/36ajaxing.js
	public/javascript/jqgrid/demo/36colreorder.html
	public/javascript/jqgrid/demo/36colreorder.js
	public/javascript/jqgrid/demo/36columnchoice.html
	public/javascript/jqgrid/demo/36columnchoice.js
	public/javascript/jqgrid/demo/36custinput.html
	public/javascript/jqgrid/demo/36custinput.js
	public/javascript/jqgrid/demo/36custvalid.html
	public/javascript/jqgrid/demo/36custvalid.js
	public/javascript/jqgrid/demo/36draganddrop.html
	public/javascript/jqgrid/demo/36draganddrop.js
	public/javascript/jqgrid/demo/36newapi.html
	public/javascript/jqgrid/demo/36newapi.js
	public/javascript/jqgrid/demo/36resize.html
	public/javascript/jqgrid/demo/36resize.js
	public/javascript/jqgrid/demo/36rtl.html
	public/javascript/jqgrid/demo/36rtl.js
	public/javascript/jqgrid/demo/36scrolling.html
	public/javascript/jqgrid/demo/36scrolling.js
	public/javascript/jqgrid/demo/36sortrows.html
	public/javascript/jqgrid/demo/36sortrows.js
	public/javascript/jqgrid/demo/37array.html
	public/javascript/jqgrid/demo/37array.js
	public/javascript/jqgrid/demo/37crud.html
	public/javascript/jqgrid/demo/37crud.js
	public/javascript/jqgrid/demo/37multiple.html
	public/javascript/jqgrid/demo/37multiple.js
	public/javascript/jqgrid/demo/37scroll.html
	public/javascript/jqgrid/demo/37scroll.js
	public/javascript/jqgrid/demo/37server.html
	public/javascript/jqgrid/demo/37server.js
	public/javascript/jqgrid/demo/37single.html
	public/javascript/jqgrid/demo/37single.js
	public/javascript/jqgrid/demo/37toolbar.html
	public/javascript/jqgrid/demo/37toolbar.js
	public/javascript/jqgrid/demo/38array.html
	public/javascript/jqgrid/demo/38array.js
	public/javascript/jqgrid/demo/38array2.html
	public/javascript/jqgrid/demo/38array2.js
	public/javascript/jqgrid/demo/38array3.html
	public/javascript/jqgrid/demo/38array3.js
	public/javascript/jqgrid/demo/38array4.html
	public/javascript/jqgrid/demo/38array4.js
	public/javascript/jqgrid/demo/38array5.html
	public/javascript/jqgrid/demo/38array5.js
	public/javascript/jqgrid/demo/38array6.html
	public/javascript/jqgrid/demo/38array6.js
	public/javascript/jqgrid/demo/38remote1.html
	public/javascript/jqgrid/demo/38remote1.js
	public/javascript/jqgrid/demo/38remote2.html
	public/javascript/jqgrid/demo/38remote2.js
	public/javascript/jqgrid/demo/38remote3.html
	public/javascript/jqgrid/demo/38remote3.js
	public/javascript/jqgrid/demo/38remote4.html
	public/javascript/jqgrid/demo/38remote4.js
	public/javascript/jqgrid/demo/38remote5.html
	public/javascript/jqgrid/demo/38remote5.js
	public/javascript/jqgrid/demo/40addnode.html
	public/javascript/jqgrid/demo/40addnode.js
	public/javascript/jqgrid/demo/40cmtmpl.html
	public/javascript/jqgrid/demo/40cmtmpl.js
	public/javascript/jqgrid/demo/40colspan.html
	public/javascript/jqgrid/demo/40colspan.js
	public/javascript/jqgrid/demo/40frmactions.html
	public/javascript/jqgrid/demo/40frmactions.js
	public/javascript/jqgrid/demo/40grpsearch.html
	public/javascript/jqgrid/demo/40grpsearch.js
	public/javascript/jqgrid/demo/40grpsearch1.html
	public/javascript/jqgrid/demo/40grpsearch1.js
	public/javascript/jqgrid/demo/40grpsearch2.html
	public/javascript/jqgrid/demo/40grpsearch2.js
	public/javascript/jqgrid/demo/40grpsearch3.html
	public/javascript/jqgrid/demo/40grpsearch3.js
	public/javascript/jqgrid/demo/40keyboard.html
	public/javascript/jqgrid/demo/40keyboard.js
	public/javascript/jqgrid/demo/40subgrid1.html
	public/javascript/jqgrid/demo/40subgrid1.js
	public/javascript/jqgrid/demo/40subgrid2.html
	public/javascript/jqgrid/demo/40subgrid2.js
	public/javascript/jqgrid/demo/40subgrid3.html
	public/javascript/jqgrid/demo/40subgrid3.js
	public/javascript/jqgrid/demo/JSON.php
	public/javascript/jqgrid/demo/adding.html
	public/javascript/jqgrid/demo/adding.js
	public/javascript/jqgrid/demo/afterinsrow.html
	public/javascript/jqgrid/demo/afterinsrow.js
	public/javascript/jqgrid/demo/autowidth.html
	public/javascript/jqgrid/demo/bigset.html
	public/javascript/jqgrid/demo/bigset.js
	public/javascript/jqgrid/demo/bigset.php
	public/javascript/jqgrid/demo/books.xml
	public/javascript/jqgrid/demo/calen.js
	public/javascript/jqgrid/demo/calendar.html
	public/javascript/jqgrid/demo/cellbug.html
	public/javascript/jqgrid/demo/celledit.html
	public/javascript/jqgrid/demo/celledit.js
	public/javascript/jqgrid/demo/cmultiex.html
	public/javascript/jqgrid/demo/cmultiex.js
	public/javascript/jqgrid/demo/csvalid.html
	public/javascript/jqgrid/demo/csvalid.js
	public/javascript/jqgrid/demo/custbutt.html
	public/javascript/jqgrid/demo/custbutt.js
	public/javascript/jqgrid/demo/custfrm.html
	public/javascript/jqgrid/demo/custfrm.js
	public/javascript/jqgrid/demo/database.sql
	public/javascript/jqgrid/demo/datatype.html
	public/javascript/jqgrid/demo/datatype.js
	public/javascript/jqgrid/demo/defparams.html
	public/javascript/jqgrid/demo/defparams.js
	public/javascript/jqgrid/demo/deleting.html
	public/javascript/jqgrid/demo/deleting.js
	public/javascript/jqgrid/demo/demo.html
	public/javascript/jqgrid/demo/editing.html
	public/javascript/jqgrid/demo/editing.js
	public/javascript/jqgrid/demo/editing.php
	public/javascript/jqgrid/demo/example.html
	public/javascript/jqgrid/demo/example.php
	public/javascript/jqgrid/demo/exportex.html
	public/javascript/jqgrid/demo/exportex.js
	public/javascript/jqgrid/demo/formatter.html
	public/javascript/jqgrid/demo/formatter.js
	public/javascript/jqgrid/demo/getex.html
	public/javascript/jqgrid/demo/getex.js
	public/javascript/jqgrid/demo/gridwidth.html
	public/javascript/jqgrid/demo/gridwidth.js
	public/javascript/jqgrid/demo/hiddengrid.html
	public/javascript/jqgrid/demo/hiddengrid.js
	public/javascript/jqgrid/demo/hidedyn.html
	public/javascript/jqgrid/demo/hidedyn.js
	public/javascript/jqgrid/demo/hideex.html
	public/javascript/jqgrid/demo/hideex.js
	public/javascript/jqgrid/demo/hideshow.html
	public/javascript/jqgrid/demo/hideshow.js
	public/javascript/jqgrid/demo/jqgrid.html
	public/javascript/jqgrid/demo/js/jquery.contextmenu.js
	public/javascript/jqgrid/demo/js/jquery.layout.js
	public/javascript/jqgrid/demo/js/src/css/jquery.searchFilter.css
	public/javascript/jqgrid/demo/js/src/grid.grouping.js
	public/javascript/jqgrid/demo/js/src/grid.loader.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-ar.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-fa.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-fr.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-mne.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-no.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-sr.js
	public/javascript/jqgrid/demo/js/src/i18n/grid.locale-th.js
	public/javascript/jqgrid/demo/js/src/jquery.searchFilter.js
	public/javascript/jqgrid/demo/jsonex.html
	public/javascript/jqgrid/demo/jsonex.js
	public/javascript/jqgrid/demo/jsonmap.html
	public/javascript/jqgrid/demo/jsonmap.js
	public/javascript/jqgrid/demo/jsonopt.html
	public/javascript/jqgrid/demo/jsonopt.js
	public/javascript/jqgrid/demo/jsubgrid.html
	public/javascript/jqgrid/demo/jsubgrid.js
	public/javascript/jqgrid/demo/loadcml.html
	public/javascript/jqgrid/demo/loadcml.js
	public/javascript/jqgrid/demo/loaderror.html
	public/javascript/jqgrid/demo/loaderror.js
	public/javascript/jqgrid/demo/loadoncex.html
	public/javascript/jqgrid/demo/loadoncex.js
	public/javascript/jqgrid/demo/localex.html
	public/javascript/jqgrid/demo/localex.js
	public/javascript/jqgrid/demo/localset.php
	public/javascript/jqgrid/demo/longtext.txt
	public/javascript/jqgrid/demo/manipex.html
	public/javascript/jqgrid/demo/manipex.js
	public/javascript/jqgrid/demo/masterex.html
	public/javascript/jqgrid/demo/masterex.js
	public/javascript/jqgrid/demo/methods.html
	public/javascript/jqgrid/demo/methods.js
	public/javascript/jqgrid/demo/methods32.html
	public/javascript/jqgrid/demo/methods32.js
	public/javascript/jqgrid/demo/multibug.html
	public/javascript/jqgrid/demo/multiex.html
	public/javascript/jqgrid/demo/multiex.js
	public/javascript/jqgrid/demo/navgrid.html
	public/javascript/jqgrid/demo/navgrid.js
	public/javascript/jqgrid/demo/navgrid2.html
	public/javascript/jqgrid/demo/navgrid2.js
	public/javascript/jqgrid/demo/navgrid3.html
	public/javascript/jqgrid/demo/navgrid3.js
	public/javascript/jqgrid/demo/navgrid4.html
	public/javascript/jqgrid/demo/navgrid4.js
	public/javascript/jqgrid/demo/postdata.html
	public/javascript/jqgrid/demo/postdata.js
	public/javascript/jqgrid/demo/readme.txt
	public/javascript/jqgrid/demo/refactor.html
	public/javascript/jqgrid/demo/resizecol.html
	public/javascript/jqgrid/demo/resizecol.js
	public/javascript/jqgrid/demo/resizeex.html
	public/javascript/jqgrid/demo/resizeex.js
	public/javascript/jqgrid/demo/rowedex1.html
	public/javascript/jqgrid/demo/rowedex1.js
	public/javascript/jqgrid/demo/rowedex2.html
	public/javascript/jqgrid/demo/rowedex2.js
	public/javascript/jqgrid/demo/rowedex3.html
	public/javascript/jqgrid/demo/rowedex3.js
	public/javascript/jqgrid/demo/rowedex4.html
	public/javascript/jqgrid/demo/rowedex4.js
	public/javascript/jqgrid/demo/rowedex5.html
	public/javascript/jqgrid/demo/rowedex5.js
	public/javascript/jqgrid/demo/scrgrid.html
	public/javascript/jqgrid/demo/scrgrid.js
	public/javascript/jqgrid/demo/search.php
	public/javascript/jqgrid/demo/search1.html
	public/javascript/jqgrid/demo/search1.js
	public/javascript/jqgrid/demo/search2.html
	public/javascript/jqgrid/demo/search2.js
	public/javascript/jqgrid/demo/search3.html
	public/javascript/jqgrid/demo/search3.js
	public/javascript/jqgrid/demo/search4.html
	public/javascript/jqgrid/demo/search4.js
	public/javascript/jqgrid/demo/search_adv.php
	public/javascript/jqgrid/demo/searching.html
	public/javascript/jqgrid/demo/searching.js
	public/javascript/jqgrid/demo/selectall.html
	public/javascript/jqgrid/demo/selectall.js
	public/javascript/jqgrid/demo/server_ado.php
	public/javascript/jqgrid/demo/setcolumns.html
	public/javascript/jqgrid/demo/setcolumns.js
	public/javascript/jqgrid/demo/setex.html
	public/javascript/jqgrid/demo/setex.js
	public/javascript/jqgrid/demo/someurl.php
	public/javascript/jqgrid/demo/sortcols.html
	public/javascript/jqgrid/demo/sortcols.js
	public/javascript/jqgrid/demo/speed.html
	public/javascript/jqgrid/demo/speed.js
	public/javascript/jqgrid/demo/subgrid.html
	public/javascript/jqgrid/demo/subgrid.js
	public/javascript/jqgrid/demo/subgrid.php
	public/javascript/jqgrid/demo/subgrid_grid.html
	public/javascript/jqgrid/demo/subgrid_grid.js
	public/javascript/jqgrid/demo/summary.html
	public/javascript/jqgrid/demo/summary.js
	public/javascript/jqgrid/demo/tbltogrid.html
	public/javascript/jqgrid/demo/tbltogrid.js
	public/javascript/jqgrid/demo/testxml.xml
	public/javascript/jqgrid/demo/themes/ellipsis-xbl.xml
	public/javascript/jqgrid/demo/toolbar.html
	public/javascript/jqgrid/demo/toolbar.js
	public/javascript/jqgrid/demo/tree.xml
	public/javascript/jqgrid/demo/treegrid.html
	public/javascript/jqgrid/demo/treegrid.js
	public/javascript/jqgrid/demo/treegrid2.html
	public/javascript/jqgrid/demo/treegrid2.js
	public/javascript/jqgrid/demo/treegridadv.html
	public/javascript/jqgrid/demo/treegridadv.js
	public/javascript/jqgrid/demo/xmlex.html
	public/javascript/jqgrid/demo/xmlex.js
	public/javascript/jqgrid/demo/xmlex2.html
	public/javascript/jqgrid/demo/xmlimp.html
	public/javascript/jqgrid/demo/xmlimp.js
	public/javascript/jqgrid/demo/xmlmap.html
	public/javascript/jqgrid/demo/xmlmap.js
	public/javascript/jqgrid/js/i18n/grid.locale-ar.js
	public/javascript/jqgrid/js/i18n/grid.locale-bg.js
	public/javascript/jqgrid/js/i18n/grid.locale-bg1251.js
	public/javascript/jqgrid/js/i18n/grid.locale-cat.js
	public/javascript/jqgrid/js/i18n/grid.locale-cn.js
	public/javascript/jqgrid/js/i18n/grid.locale-cs.js
	public/javascript/jqgrid/js/i18n/grid.locale-da.js
	public/javascript/jqgrid/js/i18n/grid.locale-de.js
	public/javascript/jqgrid/js/i18n/grid.locale-el.js
	public/javascript/jqgrid/js/i18n/grid.locale-en.js
	public/javascript/jqgrid/js/i18n/grid.locale-es.js
	public/javascript/jqgrid/js/i18n/grid.locale-fa.js
	public/javascript/jqgrid/js/i18n/grid.locale-fi.js
	public/javascript/jqgrid/js/i18n/grid.locale-fr.js
	public/javascript/jqgrid/js/i18n/grid.locale-gl.js
	public/javascript/jqgrid/js/i18n/grid.locale-he.js
	public/javascript/jqgrid/js/i18n/grid.locale-hr.js
	public/javascript/jqgrid/js/i18n/grid.locale-hr1250.js
	public/javascript/jqgrid/js/i18n/grid.locale-hu.js
	public/javascript/jqgrid/js/i18n/grid.locale-id.js
	public/javascript/jqgrid/js/i18n/grid.locale-is.js
	public/javascript/jqgrid/js/i18n/grid.locale-ja.js
	public/javascript/jqgrid/js/i18n/grid.locale-kr.js
	public/javascript/jqgrid/js/i18n/grid.locale-lt.js
	public/javascript/jqgrid/js/i18n/grid.locale-mne.js
	public/javascript/jqgrid/js/i18n/grid.locale-nl.js
	public/javascript/jqgrid/js/i18n/grid.locale-no.js
	public/javascript/jqgrid/js/i18n/grid.locale-pt-br.js
	public/javascript/jqgrid/js/i18n/grid.locale-pt.js
	public/javascript/jqgrid/js/i18n/grid.locale-ro.js
	public/javascript/jqgrid/js/i18n/grid.locale-ru.js
	public/javascript/jqgrid/js/i18n/grid.locale-sk.js
	public/javascript/jqgrid/js/i18n/grid.locale-sr-latin.js
	public/javascript/jqgrid/js/i18n/grid.locale-sr.js
	public/javascript/jqgrid/js/i18n/grid.locale-sv.js
	public/javascript/jqgrid/js/i18n/grid.locale-th.js
	public/javascript/jqgrid/js/i18n/grid.locale-tr.js
	public/javascript/jqgrid/js/i18n/grid.locale-tw.js
	public/javascript/jqgrid/js/i18n/grid.locale-ua.js
	public/javascript/jqgrid/js/i18n/grid.locale-vi.js
	public/javascript/jqgrid/js/install.txt
	public/javascript/jqgrid/js/jquery.jqGrid.src.js
	public/javascript/jqgrid/plugins/grid.addons.js
	public/javascript/jqgrid/plugins/grid.postext.js
	public/javascript/jqgrid/plugins/grid.setcolumns.js
	public/javascript/jqgrid/plugins/jquery.contextmenu.js
	public/javascript/jqgrid/plugins/jquery.searchFilter.js
	public/javascript/jqgrid/plugins/jquery.tablednd.js
	public/javascript/jqgrid/plugins/searchFilter.css
	public/javascript/jqgrid/plugins/ui.multiselect.css
	public/javascript/jqgrid/plugins/ui.multiselect.js
	public/javascript/jqgrid/src/JsonXml.js
	public/javascript/jqgrid/src/css/ellipsis-xbl.xml
	public/javascript/jqgrid/src/css/ui.jqgrid.css
	public/javascript/jqgrid/src/grid.base.js
	public/javascript/jqgrid/src/grid.celledit.js
	public/javascript/jqgrid/src/grid.common.js
	public/javascript/jqgrid/src/grid.custom.js
	public/javascript/jqgrid/src/grid.filter.js
	public/javascript/jqgrid/src/grid.formedit.js
	public/javascript/jqgrid/src/grid.grouping.js
	public/javascript/jqgrid/src/grid.import.js
	public/javascript/jqgrid/src/grid.inlinedit.js
	public/javascript/jqgrid/src/grid.jqueryui.js
	public/javascript/jqgrid/src/grid.loader.js
	public/javascript/jqgrid/src/grid.subgrid.js
	public/javascript/jqgrid/src/grid.tbltogrid.js
	public/javascript/jqgrid/src/grid.treegrid.js
	public/javascript/jqgrid/src/i18n/grid.locale-ar.js
	public/javascript/jqgrid/src/i18n/grid.locale-bg.js
	public/javascript/jqgrid/src/i18n/grid.locale-bg1251.js
	public/javascript/jqgrid/src/i18n/grid.locale-cat.js
	public/javascript/jqgrid/src/i18n/grid.locale-cn.js
	public/javascript/jqgrid/src/i18n/grid.locale-cs.js
	public/javascript/jqgrid/src/i18n/grid.locale-da.js
	public/javascript/jqgrid/src/i18n/grid.locale-de.js
	public/javascript/jqgrid/src/i18n/grid.locale-el.js
	public/javascript/jqgrid/src/i18n/grid.locale-en.js
	public/javascript/jqgrid/src/i18n/grid.locale-es.js
	public/javascript/jqgrid/src/i18n/grid.locale-fa.js
	public/javascript/jqgrid/src/i18n/grid.locale-fi.js
	public/javascript/jqgrid/src/i18n/grid.locale-fr.js
	public/javascript/jqgrid/src/i18n/grid.locale-gl.js
	public/javascript/jqgrid/src/i18n/grid.locale-he.js
	public/javascript/jqgrid/src/i18n/grid.locale-hr.js
	public/javascript/jqgrid/src/i18n/grid.locale-hr1250.js
	public/javascript/jqgrid/src/i18n/grid.locale-hu.js
	public/javascript/jqgrid/src/i18n/grid.locale-id.js
	public/javascript/jqgrid/src/i18n/grid.locale-is.js
	public/javascript/jqgrid/src/i18n/grid.locale-ja.js
	public/javascript/jqgrid/src/i18n/grid.locale-kr.js
	public/javascript/jqgrid/src/i18n/grid.locale-lt.js
	public/javascript/jqgrid/src/i18n/grid.locale-mne.js
	public/javascript/jqgrid/src/i18n/grid.locale-nl.js
	public/javascript/jqgrid/src/i18n/grid.locale-no.js
	public/javascript/jqgrid/src/i18n/grid.locale-pt-br.js
	public/javascript/jqgrid/src/i18n/grid.locale-pt.js
	public/javascript/jqgrid/src/i18n/grid.locale-ro.js
	public/javascript/jqgrid/src/i18n/grid.locale-ru.js
	public/javascript/jqgrid/src/i18n/grid.locale-sk.js
	public/javascript/jqgrid/src/i18n/grid.locale-sr-latin.js
	public/javascript/jqgrid/src/i18n/grid.locale-sr.js
	public/javascript/jqgrid/src/i18n/grid.locale-sv.js
	public/javascript/jqgrid/src/i18n/grid.locale-th.js
	public/javascript/jqgrid/src/i18n/grid.locale-tr.js
	public/javascript/jqgrid/src/i18n/grid.locale-tw.js
	public/javascript/jqgrid/src/i18n/grid.locale-ua.js
	public/javascript/jqgrid/src/i18n/grid.locale-vi.js
	public/javascript/jqgrid/src/jqDnR.js
	public/javascript/jqgrid/src/jqModal.js
	public/javascript/jqgrid/src/jquery.fmatter.js
	public/javascript/jqgrid/src/jquery.jqGrid.js
	public/javascript/timepicker/jquery-ui-timepicker-addon.js
	public/reportes/extracto/extracto_resumen.jasper
	public/reportes/extracto/extracto_resumen.jrxml
	public/temp/_prestamosadminiziolite2col.css
	public/temp/_prestamosadminiziolitemain.css
	public/temp/_prestamosadminiziolitemystyle.css
	public/temp/_prestamosadminiziolitereset.css
	public/temp/_prestamosadminiziolitestyle.css
	public/temp/_prestamosmenu_drop_downstyles.css
	public/temp/_prestamosmenu_drop_downstyles_h1.css
	public/temp/index.html
Merge branch 'master' of https://github.com/softdesignermonteria/prestamos