Merge branches 'David' and 'Edgar' of https://github.com/Edgarciarod/InventarioMarcosYCuadors into Edgar

Conflicts:
	src/modules/NuevoPedido.py