test2
Merge branch 'master' of github.com:jampzo/develop_cicpc

ok
	modified:   .gitattributes
	modified:   .gitignore
	modified:   .htaccess
	modified:   README.md
	deleted:    cicpc
	modified:   license.txt
	modified:   wp-content/plugins/carousel-horizontal-posts-content-slider/License.txt
	modified:   wp-content/plugins/carousel-horizontal-posts-content-slider/carousel-horizontal-posts-content-slider.php
	modified:   wp-content/plugins/carousel-horizontal-posts-content-slider/css/custom-style.css
	modified:   wp-content/plugins/carousel-horizontal-posts-content-slider/inc/custom.js
	modified:   wp-content/plugins/carousel-horizontal-posts-content-slider/readme.txt
	modified:   wp-content/plugins/carousel-horizontal-posts-content-slider/slider-management.php
	modified:   wp-content/plugins/floating-social-media-icon/acurax-social-icon.php
	modified:   wp-content/plugins/floating-social-media-icon/dynamic_admin_style.css
	modified:   wp-content/plugins/floating-social-media-icon/fsmi-misc.php
	modified:   wp-content/plugins/floating-social-media-icon/function.php
	modified:   wp-content/plugins/floating-social-media-icon/images/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/1/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/10/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/11/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/12/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/13/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/14/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/15/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/16/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/17/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/18/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/19/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/2/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/20/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/21/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/22/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/23/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/24/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/3/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/4/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/5/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/6/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/7/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/8/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/9/index.html
	modified:   wp-content/plugins/floating-social-media-icon/images/themes/index.html
	modified:   wp-content/plugins/floating-social-media-icon/premium.php
	modified:   wp-content/plugins/floating-social-media-icon/readme.txt
	modified:   wp-content/plugins/floating-social-media-icon/social-help.php
	modified:   wp-content/plugins/floating-social-media-icon/social-icon.php
	modified:   wp-content/plugins/floating-social-media-icon/style.css
	modified:   wp-content/plugins/floating-social-media-icon/style_admin.css
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerAddAlbumsGalleries.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerAddTags.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerAlbums_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerEditThumb.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerFeatured_plugins_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerGalleries_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerLicensing_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerOptions_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerTags_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerThemes_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerUninstall_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerWidget.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerWidgetSlideshow.php
	modified:   wp-content/plugins/photo-gallery/admin/controllers/BWGControllerWidgetTags.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelAddAlbumsGalleries.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelAddTags.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelAlbums_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelEditThumb.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelFeatured_plugins_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelGalleries_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelLicensing_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelOptions_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelTags_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelThemes_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelUninstall_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelWidget.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelWidgetSlideshow.php
	modified:   wp-content/plugins/photo-gallery/admin/models/BWGModelWidgetTags.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewAddAlbumsGalleries.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewAddTags.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewAlbums_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewBWGShortcode.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewEditThumb.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewFeatured_plugins_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewGalleries_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewLicensing_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewOptions_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewTags_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewThemes_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewUninstall_bwg.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewWidget.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewWidgetSlideshow.php
	modified:   wp-content/plugins/photo-gallery/admin/views/BWGViewWidgetTags.php
	modified:   wp-content/plugins/photo-gallery/css/bwg_featured_plugins.css
	modified:   wp-content/plugins/photo-gallery/css/bwg_licensing.css
	modified:   wp-content/plugins/photo-gallery/css/bwg_tables.css
	modified:   wp-content/plugins/photo-gallery/css/jquery.mCustomScrollbar.css
	modified:   wp-content/plugins/photo-gallery/filemanager/UploadHandler.php
	modified:   wp-content/plugins/photo-gallery/filemanager/controller.php
	modified:   wp-content/plugins/photo-gallery/filemanager/css/default.css
	modified:   wp-content/plugins/photo-gallery/filemanager/css/default_view_list.css
	modified:   wp-content/plugins/photo-gallery/filemanager/css/default_view_thumbs.css
	modified:   wp-content/plugins/photo-gallery/filemanager/css/index.html
	modified:   wp-content/plugins/photo-gallery/filemanager/images/btn_icons/index.html
	modified:   wp-content/plugins/photo-gallery/filemanager/images/file_icons/index.html
	modified:   wp-content/plugins/photo-gallery/filemanager/images/index.html
	modified:   wp-content/plugins/photo-gallery/filemanager/js/default.js
	modified:   wp-content/plugins/photo-gallery/filemanager/js/jq_uploader/index.html
	modified:   wp-content/plugins/photo-gallery/filemanager/js/jq_uploader/jquery.fileupload.js
	modified:   wp-content/plugins/photo-gallery/filemanager/js/jq_uploader/jquery.iframe-transport.js
	modified:   wp-content/plugins/photo-gallery/filemanager/js/jq_uploader/jquery.upload-1.0.2.js
	modified:   wp-content/plugins/photo-gallery/filemanager/model.php
	modified:   wp-content/plugins/photo-gallery/filemanager/view.php
	modified:   wp-content/plugins/photo-gallery/framework/WDWLibrary.php
	modified:   wp-content/plugins/photo-gallery/frontend/controllers/BWGControllerAlbum_compact_preview.php
	modified:   wp-content/plugins/photo-gallery/frontend/controllers/BWGControllerAlbum_extended_preview.php
	modified:   wp-content/plugins/photo-gallery/frontend/controllers/BWGControllerImage_browser.php
	modified:   wp-content/plugins/photo-gallery/frontend/controllers/BWGControllerThumbnails.php
	modified:   wp-content/plugins/photo-gallery/frontend/controllers/BWGControllerWidget.php
	modified:   wp-content/plugins/photo-gallery/frontend/models/BWGModelAlbum_compact_preview.php
	modified:   wp-content/plugins/photo-gallery/frontend/models/BWGModelAlbum_extended_preview.php
	modified:   wp-content/plugins/photo-gallery/frontend/models/BWGModelImage_browser.php
	modified:   wp-content/plugins/photo-gallery/frontend/models/BWGModelThumbnails.php
	modified:   wp-content/plugins/photo-gallery/frontend/models/BWGModelWidget.php
	modified:   wp-content/plugins/photo-gallery/frontend/views/BWGViewAlbum_compact_preview.php
	modified:   wp-content/plugins/photo-gallery/frontend/views/BWGViewAlbum_extended_preview.php
	modified:   wp-content/plugins/photo-gallery/frontend/views/BWGViewImage_browser.php
	modified:   wp-content/plugins/photo-gallery/frontend/views/BWGViewThumbnails.php
	modified:   wp-content/plugins/photo-gallery/js/3DEngine/3DEngine.js
	modified:   wp-content/plugins/photo-gallery/js/3DEngine/Sphere.js
	modified:   wp-content/plugins/photo-gallery/js/bwg.js
	modified:   wp-content/plugins/photo-gallery/js/bwg_editor_button.js
	modified:   wp-content/plugins/photo-gallery/js/bwg_frontend.js
	modified:   wp-content/plugins/photo-gallery/js/bwg_gallery_box.js
	modified:   wp-content/plugins/photo-gallery/js/bwg_shortcode.js
	modified:   wp-content/plugins/photo-gallery/js/jquery.mCustomScrollbar.concat.min.js
	modified:   wp-content/plugins/photo-gallery/js/jquery.mobile.js
	modified:   wp-content/plugins/photo-gallery/js/jscolor/index.html
	modified:   wp-content/plugins/photo-gallery/js/jscolor/jscolor.js
	modified:   wp-content/plugins/photo-gallery/photo-gallery.php
	modified:   wp-content/plugins/photo-gallery/readme.txt
	modified:   wp-content/plugins/photo-gallery/update/bwg_update.php
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/box-shortcodes.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/content-shortcodes.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/galleries-shortcodes.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/generator.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/magnific-popup.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/media-shortcodes.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/options-page.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/other-shortcodes.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/owl-carousel-transitions.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/owl-carousel.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/players-shortcodes.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/qtip.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/simpleslider.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/sunrise.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/tinymce.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/css/vote.css
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/ace/ace.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/chart.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/file-upload.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/form.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/galleries-shortcodes.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/generator.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/iframe-transport.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/inview.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/jplayer.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/jsrender.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/magnific-popup.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/options-page.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/other-shortcodes.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/players-shortcodes.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/qtip.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/simpleslider.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/sunrise.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/swiper.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/tinymce.js
	modified:   wp-content/plugins/shortcodes-ultimate/assets/js/vote.js
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/admin-views.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/assets.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/counters.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/data.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/generator-views.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/generator.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/load.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/requirements.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/shortcodes.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/tools.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/vote.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/core/widget.php
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/animations.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/buttons.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/columns.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/media.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/nested.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/posts.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/spoilers.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/examples/tabs.example
	modified:   wp-content/plugins/shortcodes-ultimate/inc/vendor/sunrise.php
	modified:   wp-content/plugins/shortcodes-ultimate/languages/su-el_GR.po
	modified:   wp-content/plugins/shortcodes-ultimate/languages/su-fr_FR.po
	modified:   wp-content/plugins/shortcodes-ultimate/languages/su-ja.po
	modified:   wp-content/plugins/shortcodes-ultimate/languages/su-nl_NL.po
	modified:   wp-content/plugins/shortcodes-ultimate/languages/su-vi.po
	modified:   wp-content/plugins/shortcodes-ultimate/readme.txt
	modified:   wp-content/plugins/shortcodes-ultimate/shortcodes-ultimate.php
	modified:   wp-content/plugins/shortcodes-ultimate/templates/default-loop.php
	modified:   wp-content/plugins/shortcodes-ultimate/templates/list-loop.php
	modified:   wp-content/plugins/shortcodes-ultimate/templates/single-post.php
	modified:   wp-content/plugins/shortcodes-ultimate/templates/teaser-loop.php
	modified:   wp-content/plugins/wordfence/css/colorbox.css
	modified:   wp-content/plugins/wordfence/js/jquery.colorbox-min.js
	modified:   wp-content/plugins/wordfence/lib/whois/whois.client.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.de.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.gtld.namejuice.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.ip.lib.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.ip.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.main.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.mobi.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.nl.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.nz.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.org.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.parser.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.sc.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.servers.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.si.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.utils.php
	modified:   wp-content/plugins/wordfence/lib/whois/whois.ve.php
	modified:   wp-content/themes/nonline/acordeon.php
	modified:   wp-content/themes/nonline/busqueda.html
	modified:   wp-content/themes/nonline/clases/database/MYSQL.php
	modified:   wp-content/themes/nonline/clases/database/conectar.php
	modified:   wp-content/themes/nonline/clases/database/constantes.php
	modified:   wp-content/themes/nonline/clases/database/datos_conexion/mysql_datos.php
	modified:   wp-content/themes/nonline/clases/operaciones/vehiculo_recuperado.php
	modified:   wp-content/themes/nonline/clases/syscicpc.php
	modified:   wp-content/themes/nonline/clases/utilitaria/api.php
	modified:   wp-content/themes/nonline/content-page.php
	modified:   wp-content/themes/nonline/content.php
	modified:   wp-content/themes/nonline/control.php
	modified:   wp-content/themes/nonline/css/busqueda.css
	modified:   wp-content/themes/nonline/css/diapo.css
	modified:   wp-content/themes/nonline/css/estilos.css
	modified:   wp-content/themes/nonline/css/ppal.css
	modified:   wp-content/themes/nonline/css/redmond/jquery.ui.theme.css
	modified:   wp-content/themes/nonline/css/style.css
	modified:   wp-content/themes/nonline/exec/vehiculo_recuperado.php
	modified:   wp-content/themes/nonline/footer.php
	modified:   wp-content/themes/nonline/functions.php
	modified:   wp-content/themes/nonline/header.php
	modified:   wp-content/themes/nonline/index-cicpc.php
	modified:   wp-content/themes/nonline/index.php
	modified:   wp-content/themes/nonline/js/cicpc.js
	modified:   wp-content/themes/nonline/js/ui/jquery-ui.js
	modified:   wp-content/themes/nonline/page.php
	modified:   wp-content/themes/nonline/prueba.php
	modified:   wp-content/themes/nonline/sidebar.php
	modified:   wp-content/themes/nonline/style.css
	modified:   wp-content/themes/nonline/tabs.php
	modified:   wp-content/themes/twentytwelve/css/diapo.css
	modified:   wp-content/themes/twentytwelve/index-cicpc.php
	modified:   wp-content/themes/twentytwelve/js/cicpc.js
	modified:   wp-includes/images/crystal/license.txt
	modified:   wp-includes/js/jquery/jquery-migrate.js
	modified:   wp-includes/js/jquery/jquery-migrate.min.js
erase wp-config.php
erase database config 2
database_original
update de gititnore