adding serving records
Merge branch 'add_dynamic_serving_fields'

Conflicts:
	app/controllers/shops_controller.rb