fuuuusión
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