added mail when order shipped
fixed mailer
merged master