cambios en la barra head del search
probando el text box y los select en el head de search_view
terminado diseño de las pantallas searcher_view y search_view

tambien hecho el menu del head
cambios menores en interfaz y refactorización

por fin colocado icono-casita en su sitio!!, tres minilogos hechos
y archivos css creados (limpieza de código)
seguimos mejorando interfaz del buscador (los selects)

selects guapos encontrados q no tiran pq usan ajax y hay conflictos :S
hago el commit igualmente para tenerlo de referencia
buscador arreglado (buscar tu población)  + detalles de interfaz

ya funciona cuando se busca por población y servicios a la vez
buscador arreglado(busqueda general)

ya el textbox principal busca en toda la tabla. Añadidos algunos css y
js para selects de diseño q siguen sin funcionar
Cosas de diseño en el buscador

también añadida una condición en la búsqueda para que no se pueda hacer
una búsqueda con un solo carácter.
arreglo de un bug en el buscador

petaba cuando se buscaba solo seleccionando algo de los selects
Merge branch 'Yeray' into hector

Conflicts:
	system/.htaccess
	system/core/Benchmark.php
	system/core/CodeIgniter.php
	system/core/Common.php
	system/core/Config.php
	system/core/Controller.php
	system/core/Exceptions.php
	system/core/Hooks.php
	system/core/Input.php
	system/core/Lang.php
	system/core/Loader.php
	system/core/Model.php
	system/core/Output.php
	system/core/Router.php
	system/core/Security.php
	system/core/URI.php
	system/core/Utf8.php
	system/core/index.html
	system/database/DB.php
	system/database/DB_active_rec.php
	system/database/DB_cache.php
	system/database/DB_driver.php
	system/database/DB_forge.php
	system/database/DB_result.php
	system/database/DB_utility.php
	system/database/drivers/cubrid/cubrid_driver.php
	system/database/drivers/cubrid/cubrid_forge.php
	system/database/drivers/cubrid/cubrid_result.php
	system/database/drivers/cubrid/cubrid_utility.php
	system/database/drivers/cubrid/index.html
	system/database/drivers/index.html
	system/database/drivers/mssql/index.html
	system/database/drivers/mssql/mssql_driver.php
	system/database/drivers/mssql/mssql_forge.php
	system/database/drivers/mssql/mssql_result.php
	system/database/drivers/mssql/mssql_utility.php
	system/database/drivers/mysql/index.html
	system/database/drivers/mysql/mysql_driver.php
	system/database/drivers/mysql/mysql_forge.php
	system/database/drivers/mysql/mysql_result.php
	system/database/drivers/mysql/mysql_utility.php
	system/database/drivers/mysqli/index.html
	system/database/drivers/mysqli/mysqli_driver.php
	system/database/drivers/mysqli/mysqli_forge.php
	system/database/drivers/mysqli/mysqli_result.php
	system/database/drivers/mysqli/mysqli_utility.php
	system/database/drivers/oci8/index.html
	system/database/drivers/oci8/oci8_driver.php
	system/database/drivers/oci8/oci8_forge.php
	system/database/drivers/oci8/oci8_result.php
	system/database/drivers/oci8/oci8_utility.php
	system/database/drivers/odbc/index.html
	system/database/drivers/odbc/odbc_driver.php
	system/database/drivers/odbc/odbc_forge.php
	system/database/drivers/odbc/odbc_result.php
	system/database/drivers/odbc/odbc_utility.php
	system/database/drivers/pdo/index.html
	system/database/drivers/pdo/pdo_driver.php
	system/database/drivers/pdo/pdo_forge.php
	system/database/drivers/pdo/pdo_result.php
	system/database/drivers/pdo/pdo_utility.php
	system/database/drivers/postgre/index.html
	system/database/drivers/postgre/postgre_driver.php
	system/database/drivers/postgre/postgre_forge.php
	system/database/drivers/postgre/postgre_result.php
	system/database/drivers/postgre/postgre_utility.php
	system/database/drivers/sqlite/index.html
	system/database/drivers/sqlite/sqlite_driver.php
	system/database/drivers/sqlite/sqlite_forge.php
	system/database/drivers/sqlite/sqlite_result.php
	system/database/drivers/sqlite/sqlite_utility.php
	system/database/drivers/sqlsrv/index.html
	system/database/drivers/sqlsrv/sqlsrv_driver.php
	system/database/drivers/sqlsrv/sqlsrv_forge.php
	system/database/drivers/sqlsrv/sqlsrv_result.php
	system/database/drivers/sqlsrv/sqlsrv_utility.php
	system/database/index.html
	system/fonts/index.html
	system/fonts/texb.ttf
	system/helpers/array_helper.php
	system/helpers/captcha_helper.php
	system/helpers/cookie_helper.php
	system/helpers/date_helper.php
	system/helpers/directory_helper.php
	system/helpers/download_helper.php
	system/helpers/email_helper.php
	system/helpers/file_helper.php
	system/helpers/form_helper.php
	system/helpers/html_helper.php
	system/helpers/index.html
	system/helpers/inflector_helper.php
	system/helpers/language_helper.php
	system/helpers/number_helper.php
	system/helpers/path_helper.php
	system/helpers/security_helper.php
	system/helpers/smiley_helper.php
	system/helpers/string_helper.php
	system/helpers/text_helper.php
	system/helpers/typography_helper.php
	system/helpers/url_helper.php
	system/helpers/xml_helper.php
	system/index.html
	system/language/english/calendar_lang.php
	system/language/english/date_lang.php
	system/language/english/db_lang.php
	system/language/english/email_lang.php
	system/language/english/form_validation_lang.php
	system/language/english/ftp_lang.php
	system/language/english/imglib_lang.php
	system/language/english/index.html
	system/language/english/migration_lang.php
	system/language/english/number_lang.php
	system/language/english/profiler_lang.php
	system/language/english/unit_test_lang.php
	system/language/english/upload_lang.php
	system/language/index.html
	system/libraries/Cache/Cache.php
	system/libraries/Cache/drivers/Cache_apc.php
	system/libraries/Cache/drivers/Cache_dummy.php
	system/libraries/Cache/drivers/Cache_file.php
	system/libraries/Cache/drivers/Cache_memcached.php
	system/libraries/Calendar.php
	system/libraries/Cart.php
	system/libraries/Driver.php
	system/libraries/Email.php
	system/libraries/Encrypt.php
	system/libraries/Form_validation.php
	system/libraries/Ftp.php
	system/libraries/Image_lib.php
	system/libraries/Javascript.php
	system/libraries/Log.php
	system/libraries/Migration.php
	system/libraries/Pagination.php
	system/libraries/Parser.php
	system/libraries/Profiler.php
	system/libraries/Session.php
	system/libraries/Sha1.php
	system/libraries/Table.php
	system/libraries/Trackback.php
	system/libraries/Typography.php
	system/libraries/Unit_test.php
	system/libraries/Upload.php
	system/libraries/User_agent.php
	system/libraries/Xmlrpc.php
	system/libraries/Xmlrpcs.php
	system/libraries/Zip.php
	system/libraries/index.html
	system/libraries/javascript/Jquery.php
	user_guide/changelog.html
	user_guide/database/active_record.html
	user_guide/database/caching.html
	user_guide/database/call_function.html
	user_guide/database/configuration.html
	user_guide/database/connecting.html
	user_guide/database/examples.html
	user_guide/database/fields.html
	user_guide/database/forge.html
	user_guide/database/helpers.html
	user_guide/database/index.html
	user_guide/database/queries.html
	user_guide/database/results.html
	user_guide/database/table_data.html
	user_guide/database/transactions.html
	user_guide/database/utilities.html
	user_guide/doc_style/index.html
	user_guide/doc_style/template.html
	user_guide/general/alternative_php.html
	user_guide/general/ancillary_classes.html
	user_guide/general/autoloader.html
	user_guide/general/caching.html
	user_guide/general/cli.html
	user_guide/general/common_functions.html
	user_guide/general/controllers.html
	user_guide/general/core_classes.html
	user_guide/general/creating_drivers.html
	user_guide/general/creating_libraries.html
	user_guide/general/credits.html
	user_guide/general/drivers.html
	user_guide/general/environments.html
	user_guide/general/errors.html
	user_guide/general/helpers.html
	user_guide/general/hooks.html
	user_guide/general/libraries.html
	user_guide/general/managing_apps.html
	user_guide/general/models.html
	user_guide/general/profiling.html
	user_guide/general/quick_reference.html
	user_guide/general/requirements.html
	user_guide/general/reserved_names.html
	user_guide/general/routing.html
	user_guide/general/security.html
	user_guide/general/styleguide.html
	user_guide/general/urls.html
	user_guide/general/views.html
	user_guide/helpers/array_helper.html
	user_guide/helpers/captcha_helper.html
	user_guide/helpers/cookie_helper.html
	user_guide/helpers/date_helper.html
	user_guide/helpers/directory_helper.html
	user_guide/helpers/download_helper.html
	user_guide/helpers/email_helper.html
	user_guide/helpers/file_helper.html
	user_guide/helpers/form_helper.html
	user_guide/helpers/html_helper.html
	user_guide/helpers/inflector_helper.html
	user_guide/helpers/language_helper.html
	user_guide/helpers/number_helper.html
	user_guide/helpers/path_helper.html
	user_guide/helpers/security_helper.html
	user_guide/helpers/smiley_helper.html
	user_guide/helpers/string_helper.html
	user_guide/helpers/text_helper.html
	user_guide/helpers/typography_helper.html
	user_guide/helpers/url_helper.html
	user_guide/helpers/xml_helper.html
	user_guide/images/appflowchart.gif
	user_guide/images/arrow.gif
	user_guide/images/ci_logo.jpg
	user_guide/images/ci_logo_flame.jpg
	user_guide/images/ci_quick_ref.png
	user_guide/images/codeigniter_1.7.1_helper_reference.pdf
	user_guide/images/codeigniter_1.7.1_helper_reference.png
	user_guide/images/codeigniter_1.7.1_library_reference.pdf
	user_guide/images/codeigniter_1.7.1_library_reference.png
	user_guide/images/file.gif
	user_guide/images/folder.gif
	user_guide/images/nav_bg_darker.jpg
	user_guide/images/nav_separator_darker.jpg
	user_guide/images/nav_toggle_darker.jpg
	user_guide/images/reactor-bullet.png
	user_guide/images/smile.gif
	user_guide/images/transparent.gif
	user_guide/index.html
	user_guide/installation/downloads.html
	user_guide/installation/index.html
	user_guide/installation/troubleshooting.html
	user_guide/installation/upgrade_120.html
	user_guide/installation/upgrade_130.html
	user_guide/installation/upgrade_131.html
	user_guide/installation/upgrade_132.html
	user_guide/installation/upgrade_133.html
	user_guide/installation/upgrade_140.html
	user_guide/installation/upgrade_141.html
	user_guide/installation/upgrade_150.html
	user_guide/installation/upgrade_152.html
	user_guide/installation/upgrade_153.html
	user_guide/installation/upgrade_154.html
	user_guide/installation/upgrade_160.html
	user_guide/installation/upgrade_161.html
	user_guide/installation/upgrade_162.html
	user_guide/installation/upgrade_163.html
	user_guide/installation/upgrade_170.html
	user_guide/installation/upgrade_171.html
	user_guide/installation/upgrade_172.html
	user_guide/installation/upgrade_200.html
	user_guide/installation/upgrade_201.html
	user_guide/installation/upgrade_202.html
	user_guide/installation/upgrade_203.html
	user_guide/installation/upgrade_210.html
	user_guide/installation/upgrade_211.html
	user_guide/installation/upgrade_212.html
	user_guide/installation/upgrade_213.html
	user_guide/installation/upgrade_214.html
	user_guide/installation/upgrade_b11.html
	user_guide/installation/upgrading.html
	user_guide/libraries/benchmark.html
	user_guide/libraries/caching.html
	user_guide/libraries/calendar.html
	user_guide/libraries/cart.html
	user_guide/libraries/config.html
	user_guide/libraries/email.html
	user_guide/libraries/encryption.html
	user_guide/libraries/file_uploading.html
	user_guide/libraries/form_validation.html
	user_guide/libraries/ftp.html
	user_guide/libraries/image_lib.html
	user_guide/libraries/input.html
	user_guide/libraries/javascript.html
	user_guide/libraries/language.html
	user_guide/libraries/loader.html
	user_guide/libraries/migration.html
	user_guide/libraries/output.html
	user_guide/libraries/pagination.html
	user_guide/libraries/parser.html
	user_guide/libraries/security.html
	user_guide/libraries/sessions.html
	user_guide/libraries/table.html
	user_guide/libraries/trackback.html
	user_guide/libraries/typography.html
	user_guide/libraries/unit_testing.html
	user_guide/libraries/uri.html
	user_guide/libraries/user_agent.html
	user_guide/libraries/xmlrpc.html
	user_guide/libraries/zip.html
	user_guide/license.html
	user_guide/nav/hacks.txt
	user_guide/nav/moo.fx.js
	user_guide/nav/nav.js
	user_guide/nav/prototype.lite.js
	user_guide/nav/user_guide_menu.js
	user_guide/overview/appflow.html
	user_guide/overview/at_a_glance.html
	user_guide/overview/cheatsheets.html
	user_guide/overview/features.html
	user_guide/overview/getting_started.html
	user_guide/overview/goals.html
	user_guide/overview/index.html
	user_guide/overview/mvc.html
	user_guide/toc.html
	user_guide/tutorial/conclusion.html
	user_guide/tutorial/create_news_items.html
	user_guide/tutorial/hard_coded_pages.html
	user_guide/tutorial/index.html
	user_guide/tutorial/news_section.html
	user_guide/tutorial/static_pages.html
	user_guide/userguide.css
	web.sql
Revert f75cbb8..fbddd59

This rolls back to commit f75cbb8261ebec0a60d15812929e8b1919d862d7.
Merge branch 'hector' into Yeray

Conflicts:
	sites/21/uploads/offers_images/5f00451871b8c3ea240018b7c8ec079e/0.jpg
	sites/21/uploads/offers_images/5f00451871b8c3ea240018b7c8ec079e/1.jpg

sites/21/uploads/offers_images/5f00451871b8c3ea240018b7c8ec079e/12691952
45623_big.jpg

sites/21/uploads/offers_images/5f00451871b8c3ea240018b7c8ec079e/13607057
97826_big.jpg

sites/21/uploads/offers_images/5f00451871b8c3ea240018b7c8ec079e/13786614
24137_big.jpg
	sites/21/uploads/offers_images/5f00451871b8c3ea240018b7c8ec079e/2.jpg
	sites/21/uploads/offers_images/b6ce14980f78e6261e2f6ac683bf22d8/0.jpg
	sites/21/uploads/offers_images/b6ce14980f78e6261e2f6ac683bf22d8/1.jpg
	sites/21/uploads/offers_images/b6ce14980f78e6261e2f6ac683bf22d8/2.jpg
	sites/21/uploads/offers_images/b6ce14980f78e6261e2f6ac683bf22d8/3.jpg
	sites/21/uploads/offers_images/b6ce14980f78e6261e2f6ac683bf22d8/4.jpg
	sites/21/uploads/template_images/TopRural.jpg
	sites/21/uploads/template_images/pitch3.jpg
	sites/5/uploads/offers_archives/480c38c49a973d463025ce9410032c18/0
	sites/5/uploads/offers_archives/4a1f389cebf0cc5d26d312d9951d153f/0
	sites/5/uploads/offers_images/25c402a080ff727dd9b6ae143af6b899/0.jpg
	sites/5/uploads/offers_images/25c402a080ff727dd9b6ae143af6b899/1.jpg
	sites/5/uploads/offers_images/25c402a080ff727dd9b6ae143af6b899/2.jpg
	sites/5/uploads/offers_images/25c402a080ff727dd9b6ae143af6b899/3.jpg
	sites/5/uploads/offers_images/37d3195cd3a601739dc9ee3387dcf7d6/0.jpg
	sites/5/uploads/offers_images/37d3195cd3a601739dc9ee3387dcf7d6/1.jpg
	sites/5/uploads/offers_images/37d3195cd3a601739dc9ee3387dcf7d6/2.jpg
	sites/5/uploads/offers_images/37d3195cd3a601739dc9ee3387dcf7d6/3.jpg
	sites/5/uploads/offers_images/48ca30b269f148f6ec8689b3e2824ebe/0.jpg
	sites/5/uploads/offers_images/48ca30b269f148f6ec8689b3e2824ebe/1.jpg
	sites/5/uploads/offers_images/48ca30b269f148f6ec8689b3e2824ebe/2.jpg
	sites/5/uploads/offers_images/48ca30b269f148f6ec8689b3e2824ebe/3.jpg
	sites/5/uploads/offers_images/48ca30b269f148f6ec8689b3e2824ebe/4.jpg
	sites/5/uploads/offers_images/48ca30b269f148f6ec8689b3e2824ebe/5.jpg
	sites/5/uploads/offers_images/5d1e4321904b628e2ccd6773fc7fb5cc/0.jpg
	sites/5/uploads/offers_images/5d1e4321904b628e2ccd6773fc7fb5cc/1.jpg
	sites/5/uploads/offers_images/5d1e4321904b628e2ccd6773fc7fb5cc/2.jpg
	sites/5/uploads/offers_images/5d1e4321904b628e2ccd6773fc7fb5cc/3.jpg
	sites/5/uploads/offers_images/6f584dbb6120143307d31531abb353a6/0.jpg
	sites/5/uploads/offers_images/6f584dbb6120143307d31531abb353a6/1.jpg
	sites/5/uploads/offers_images/6f584dbb6120143307d31531abb353a6/2.jpg
	sites/5/uploads/offers_images/6f584dbb6120143307d31531abb353a6/3.jpg
	sites/5/uploads/offers_images/6f584dbb6120143307d31531abb353a6/4.jpg
	sites/5/uploads/offers_images/b19c46756c49069b7696e0ce668241b3/0.jpg
	sites/5/uploads/offers_images/b19c46756c49069b7696e0ce668241b3/1.jpg
	sites/5/uploads/offers_images/b19c46756c49069b7696e0ce668241b3/2.jpg
	sites/5/uploads/offers_images/b19c46756c49069b7696e0ce668241b3/3.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/0.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/1.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/2.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/3.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/5.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/6.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/7.jpg
	sites/5/uploads/offers_images/b5dbac2facefbbee2b5c8868094ab82f/8.jpg
	sites/5/uploads/offers_images/cc256be8fa3c4bd1f2e18e09f1021496/0.jpg
	sites/5/uploads/offers_images/cc256be8fa3c4bd1f2e18e09f1021496/1.jpg
	sites/5/uploads/offers_images/cc256be8fa3c4bd1f2e18e09f1021496/2.jpg
	sites/5/uploads/offers_images/cc256be8fa3c4bd1f2e18e09f1021496/3.jpg
	sites/5/uploads/services_images/1602535b692c78bfee94dc78d2032345
	sites/5/uploads/services_images/5903362e393e88b4b4a0e93dba0529fc
	sites/5/uploads/services_images/9815a87838f8ce25d08c4df16eb185f0
	sites/5/uploads/services_images/b1fcb5bd84643b9ccbdcfb51c50104e2
	sites/5/uploads/services_images/bdedf36be9c044e4dfacd66ac33d0591
	sites/5/uploads/services_images/e1b411f6b710263220ed26401c7b0c6a
	sites/5/uploads/services_images/f2dc9d42697a367443657499da702513
	sites/5/uploads/services_images/f72c57fa383c1457bbb023996cd9106c
	sites/5/uploads/template_images/TopRural.jpg
	sites/5/uploads/template_images/pitch3.jpg
	sites/6/uploads/icon/04765b938ff1a2f10631cfd3d5d1e5fc
	sites/6/uploads/icon/8cf27764a1aa77cda533c5dcae90cf0d
	sites/6/uploads/offers_images/81aef532e44ceb32da4c055b956db92c/0.jpg
	sites/6/uploads/offers_images/81aef532e44ceb32da4c055b956db92c/1.jpg
	sites/6/uploads/offers_images/81aef532e44ceb32da4c055b956db92c/2.jpg
	sites/6/uploads/offers_images/81aef532e44ceb32da4c055b956db92c/3.jpg
	sites/6/uploads/template_images/pitch9.jpg
	sites/AyuntamientodeValleseco/index.php
	sites/AyuntamientodeValleseco/uploads/offers_images/1094807.jpg
	sites/AyuntamientodeValleseco/uploads/offers_images/480x480.jpg
	sites/AyuntamientodeValleseco/uploads/services_images/480x480.jpg

sites/AyuntamientodeValleseco/uploads/services_images/4fbd23ac1bfb67b7a5
654dc9448edcbb
	sites/AyuntamientodeValleseco/uploads/template_images/1094807.jpg
	sites/AyuntamientodeValleseco/uploads/template_images/480x480.jpg

sites/AyuntamientodeValleseco/uploads/template_images/c960x_0617ecd178b4
f2d159070705bdce6764_1.png

sites/AyuntamientodeValleseco/uploads/template_images/l200x_0617ecd178b4
f2d159070705bdce6764_1.png
	sites/Toprural/index.php
	sites/Toprural/uploads/icon/6d83d290f5bdd0d89c5479d3f3336e4a
	sites/Toprural/uploads/icon/82b768178f488cc9ebe5ea20e9eac838
	sites/Toprural/uploads/icon/f2dc9d42697a367443657499da702513
	sites/Toprural/uploads/icon/icono - alojamiento turstico.jpg
	sites/Toprural/uploads/icon/icono_22.gif
	sites/Toprural/uploads/offers_images/1353327410230_big.jpg
	sites/Toprural/uploads/offers_images/75ba5900a8dfe7ddab82b70ae97283c7
	sites/Toprural/uploads/offers_images/e82aeb5f36d1431225379e18fdcb6679
	sites/Toprural/uploads/offers_images/ffc42fd1f064e1272cf9544deb1f5d49
	sites/Toprural/uploads/services_images/6d83d290f5bdd0d89c5479d3f3336e4a
	sites/Toprural/uploads/services_images/c6fca30d1dac675fb0d1cec28741beab
	sites/Toprural/uploads/template_images/TopRural.jpg
	sites/Toprural/uploads/template_images/pitch3.jpg
	sites/Toprural/uploads/template_images/toprural.jpeg
	sites/auto-site/index_view.php
	sites/auto-site/info_view.php
	sites/auto-site/offers_view.php
	sites/auto-site/servicices_view.php
	sites/empresa1/index.php
	sites/empresa1/index_preview.php

sites/empresa1/preview/fondos-blanco-azul-fondo-de-pantalla-cosmocax-arc
hivo-293817.jpg
	sites/empresa1/preview/index.php
	sites/empresa1/preview/logo-firefox-100px.png
	sites/empresa1/upload/logo-Firefox.png
	sites/empresa1/upload/social_icons.png
	sites/empresa1/uploads/icon/guides-ico.png
	sites/empresa1/uploads/offers_images/Enatural-Final.png
	sites/empresa1/uploads/offers_images/FondoDegradado01.jpg

sites/empresa1/uploads/offers_images/i480x_0617ecd178b4f2d159070705bdce6
764_19.png

sites/empresa1/uploads/offers_images/i480x_0617ecd178b4f2d159070705bdce6
764_77.png
	sites/empresa1/uploads/services_images/FondoDegradado01.jpg

sites/empresa1/uploads/services_images/i480x_0617ecd178b4f2d159070705bdc
e6764_77.png
	sites/empresa1/uploads/social_icons.png
	sites/empresa1/uploads/social_icons1.png
	sites/index.php