Add new field for delivered_at
Add rename and add new fields
Optimize wording for new order mailer
Merge branch 'master' of https://github.com/pionira-medical/pionira

Conflicts:
	app/controllers/orders_controller.rb
	app/models/order.rb
Use routes for i18n