Merge branch 'Asignar-producto-a-vendedor' into development

Conflicts:
	application/controllers/productos.php
	application/views/sidebars/administrador.php