Added CustomerService, modified OrderService
fixed merge issue