Warehouse service and delivery service added
Warehouse service fix
Merge