pickup date + time ++ delivery date + time OK
conflict resolving
Merge pull request #14 from MaximeHerne/order-middle

pickup date + time ++ delivery date + time OK