Vistas: galeria
Merge origin/master

Conflicts:
	application/controllers/submenu.php
resolve clientes
resolve clientes
resolve clientes backbone
activar y desactivar clientes