deliveryPointsAreas testing
delivery points
delivery_area cucumber
delivery_Area update
delivery_Area update
Merge branch 'master' into delivery

Conflicts:
	app/controllers/delivery_points_controller.rb
	app/models/delivery_point.rb
	app/views/delivery_areas/_form.html.erb
	app/views/delivery_areas/index.html.erb
	app/views/delivery_areas/show.html.erb
	app/views/delivery_points/_form.html.erb
	app/views/delivery_points/index.html.erb
	app/views/delivery_points/show.html.erb
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	features/create_new_delivery_point.feature
	features/see_all_delivery_points.feature
	features/support/paths.rb
Merge branch 'delivery'

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	features/support/paths.rb