Merge branch 'David' of https://github.com/Edgarciarod/InventarioMarcosYCuadors into David

Conflicts:
	src/LaunchInventario.py
Compretado Nuevo Pedido
Merge branches 'David' and 'Edgar' 2.0
Ya casi está listo