now REALLY variant_id and country_id are now nullable in ProductDelivery
added DELIVERY_TYPES into conf.settings