fixed message
added delivery_type and unique constraint to ProductDelivery model; removed unused method
removed unused code
fix syntax error
variant_id and country_id are now nullable in ProductDelivery
now REALLY variant_id and country_id are now nullable in ProductDelivery
added DELIVERY_TYPES into conf.settings
added DELIVERY_TYPES into conf.settings
Merge branch '5086_add_delivery_type' of github.com:MediaSapiens/flamaster into 5086_add_delivery_type

it's needed because i played with git commit --amend
delivery resource now uses new way of defining blueprints
now ProductDeliveryResource by default on GET returns delivery types with variant_id==null && country_id==null
merged from fevent_dev
Merge pull request #94 from MediaSapiens/5086_add_delivery_type

5086 add delivery type