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