Need some changes in inventory.
Merge remote-tracking branch 'test/master'

Conflicts:
	AddDelivery.dfm
	AddDelivery.pas
	Main.dfm
	Main.pas