correcciones paginas
Merge branch 'master' of https://github.com/xlledo/panel
Merge branch 'master' of https://github.com/xlledo/panel
Merge branch 'master' of https://github.com/xlledo/panel
cambios ximo, taxonomias
Merge branch 'master' of https://github.com/xlledo/panel
Merge branch 'master' of https://github.com/xlledo/panel
integracion cambios ximo
Merge branch 'master' of https://github.com/xlledo/panel
cambios idiomas
Merge branch 'master' of https://github.com/xlledo/panel
cambios
Merge branch 'master' of https://github.com/xlledo/panel
Merge branch 'master' of https://github.com/xlledo/panel
cambios
cambios revision
cambios ximo
Merge branch 'master' of https://github.com/xlledo/panel

Conflicts:
	src/views/categorias/index.blade.php
	src/views/categoriastraducibles/index.blade.php
Merge branch 'master' of https://github.com/xlledo/panel
merge ximo