Add delivery date
Merge branch 'master' of https://github.com/vinni101/spree_delivery_date

Conflicts:
	config/locales/en.yml
update locale
Update locale