include option values when loading option values from option types
fixes #5519
stack level too deep in rails 4.1.6
filter out shipment json data to avoid stack level too deep error in rails 4.1.6
add :state and :store_location_id to shipments js array

fixes #5504

Conflicts:
	backend/app/views/spree/admin/orders/_line_items_edit_form.html.erb