added 'shipped' and 'cancel' buttons to order
merge conflict fixed