Added delivery point and order association
Merge branch 'master' into orders

Conflicts:
	app/models/delivery_point.rb
	db/schema.rb