1st commit
show atts also on cart page, view order page, Edit Order page, and in emails to admin and to customer
fix merge conflict