Merge branch 'customer-contact-in-order-email' into combined/shopfront_group-buy_customer-contact

app/views/spree/order_mailer/confirm_email_for_shop.html.haml

@@ -19,9 +19,10 @@
 %h4
   Order confirmation 
   %strong ##{@order.number}
-%p
+%h5
   %strong= "#{@order.bill_address.firstname} #{@order.bill_address.lastname}"
-  completed the following order at your shopfront:
+  = " <#{@order.email}>" if @order.email
+  = @order.bill_address.phone if @order.bill_address.phone
 
 = render 'order_summary'
 = render 'payment'