Merge origin/master

Conflicts:
	administracion/consultarProducto.php