Added and implemented DeliveryDAO and JPADeliveryDAO
Merge