Home version Desktop - Tablet y Mobile
Home + Fixes
Full Home + Categoria + Articulo
Merge branch 'master' of https://github.com/bernib/sophia

Conflicts:
	css/layout.css
	css/media.css
	fonts/fonts.css
	inc_bottom-banner.php
	inc_foot.php
	inc_footer.php
	inc_head.php
	inc_header.php
	inc_nav.php
	inc_top-banner.php
	index.php
	js/funciones.js